project-chip · rwalker-apple · Jan 14, 2021 · Jan 13, 2021
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
@@ -18,7 +18,7 @@
 // Prevent multiple inclusion
 #pragma once
 
-// General cluster attributes ids
+// Global cluster attribute ids
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
@@ -4059,12 +4059,8 @@
 // Attribute ids for cluster: Binding
 
 // Client attributes
-#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
 
 // Server attributes
-#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Sample Mfg Specific Cluster
 

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
@@ -31,3 +31,5 @@ ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_
     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,
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
@@ -76,5 +76,9 @@ enum
     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_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
 };
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
@@ -5665,9 +5665,9 @@
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
@@ -5678,9 +5678,9 @@
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \

diff --git a/examples/all-clusters-app/all-clusters-common/gen/enums.h b/examples/all-clusters-app/all-clusters-common/gen/enums.h
@@ -547,7 +547,7 @@ typedef enum
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 0x02,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 0x03,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 0x04,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE______     = 0x05,
+    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 0x05,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode

diff --git a/examples/lighting-app/lighting-common/gen/attribute-id.h b/examples/lighting-app/lighting-common/gen/attribute-id.h
@@ -18,7 +18,7 @@
 // Prevent multiple inclusion
 #pragma once
 
-// General cluster attributes ids
+// Global cluster attribute ids
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
@@ -4059,12 +4059,8 @@
 // Attribute ids for cluster: Binding
 
 // Client attributes
-#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
 
 // Server attributes
-#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Sample Mfg Specific Cluster
 

diff --git a/examples/lighting-app/lighting-common/gen/attribute-size.h b/examples/lighting-app/lighting-common/gen/attribute-size.h
@@ -31,3 +31,5 @@ ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_
     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,
diff --git a/examples/lighting-app/lighting-common/gen/attribute-type.h b/examples/lighting-app/lighting-common/gen/attribute-type.h
@@ -76,5 +76,9 @@ enum
     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_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
 };
diff --git a/examples/lighting-app/lighting-common/gen/client-command-macro.h b/examples/lighting-app/lighting-common/gen/client-command-macro.h
@@ -5665,9 +5665,9 @@
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
@@ -5678,9 +5678,9 @@
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \

diff --git a/examples/lighting-app/lighting-common/gen/enums.h b/examples/lighting-app/lighting-common/gen/enums.h
@@ -547,7 +547,7 @@ typedef enum
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 0x02,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 0x03,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 0x04,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE______     = 0x05,
+    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 0x05,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode

diff --git a/examples/lock-app/lock-common/gen/attribute-id.h b/examples/lock-app/lock-common/gen/attribute-id.h
@@ -18,7 +18,7 @@
 // Prevent multiple inclusion
 #pragma once
 
-// General cluster attributes ids
+// Global cluster attribute ids
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
@@ -4059,12 +4059,8 @@
 // Attribute ids for cluster: Binding
 
 // Client attributes
-#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
 
 // Server attributes
-#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Sample Mfg Specific Cluster
 

diff --git a/examples/lock-app/lock-common/gen/attribute-size.h b/examples/lock-app/lock-common/gen/attribute-size.h
@@ -31,3 +31,5 @@ ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_
     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,
diff --git a/examples/lock-app/lock-common/gen/attribute-type.h b/examples/lock-app/lock-common/gen/attribute-type.h
@@ -76,5 +76,9 @@ enum
     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_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
 };
diff --git a/examples/lock-app/lock-common/gen/client-command-macro.h b/examples/lock-app/lock-common/gen/client-command-macro.h
@@ -5665,9 +5665,9 @@
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
@@ -5678,9 +5678,9 @@
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \

diff --git a/examples/lock-app/lock-common/gen/enums.h b/examples/lock-app/lock-common/gen/enums.h
@@ -547,7 +547,7 @@ typedef enum
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 0x02,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 0x03,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 0x04,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE______     = 0x05,
+    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 0x05,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode

@@ -18,7 +18,7 @@
 // Prevent multiple inclusion
 #pragma once
 
-// General cluster attributes ids
+// Global cluster attribute ids
 #define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
 #define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
@@ -4059,12 +4059,8 @@
 // Attribute ids for cluster: Binding
 
 // Client attributes
-#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_CLIENT_ATTRIBUTE_ID (0xFFFE)
 
 // Server attributes
-#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD)
-#define ZCL_REPORTING_STATUS_SERVER_ATTRIBUTE_ID (0xFFFE)
 
 // Attribute ids for cluster: Sample Mfg Specific Cluster
 

@@ -31,3 +31,5 @@ ZCL_DATA8_ATTRIBUTE_TYPE, 1, ZCL_DATA16_ATTRIBUTE_TYPE, 2, ZCL_DATA24_ATTRIBUTE_
     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,
@@ -76,5 +76,9 @@ enum
     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_UNKNOWN_ATTRIBUTE_TYPE           = 0xFF, // Unknown
 };
@@ -5665,9 +5665,9 @@
 /** @brief Command description for Bind
  *
  * Command: Bind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterBind(nodeId, groupId, endpointId, clusterId)                                               \
@@ -5678,9 +5678,9 @@
 /** @brief Command description for Unbind
  *
  * Command: Unbind
- * @param nodeId INT64U
- * @param groupId INT16U
- * @param endpointId INT8U
+ * @param nodeId NODE_ID
+ * @param groupId GROUP_ID
+ * @param endpointId ENDPOINT_ID
  * @param clusterId CLUSTER_ID
  */
 #define emberAfFillCommandBindingClusterUnbind(nodeId, groupId, endpointId, clusterId)                                             \

@@ -547,7 +547,7 @@ typedef enum
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PRIVACY_MODE           = 0x02,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_NO_RF_LOCK_OR_UNLOCK   = 0x03,
     EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_LOCAL_PROGRAMMING_MODE = 0x04,
-    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE______     = 0x05,
+    EMBER_ZCL_DOOR_LOCK_OPERATING_MODE_PASSAGE_MODE           = 0x05,
 } EmberAfDoorLockOperatingMode;
 
 // Enum for DoorLockOperationEventCode

diff --git a/src/app/zap-templates/common/ChipTypesHelper.js b/src/app/zap-templates/common/ChipTypesHelper.js
@@ -0,0 +1,39 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+function asBasicType(type)
+{
+  switch (type) {
+  case 'chip::CommandId':
+  case 'chip::EndpointId':
+    return 'uint8_t';
+  case 'chip::AttributeId':
+  case 'chip::ClusterId':
+  case 'chip::EventId':
+  case 'chip::GroupId':
+    return 'uint16_t';
+  case 'chip::NodeId':
+    return 'uint64_t';
+  default:
+    return type;
+  }
+}
+
+//
+// Module exports
+//
+exports.asBasicType = asBasicType;
diff --git a/src/app/zap-templates/common/override.js b/src/app/zap-templates/common/override.js
@@ -18,6 +18,12 @@
 function atomicType(arg)
 {
   switch (arg.name) {
+  case 'node_id':
+    return 'chip::NodeId';
+  case 'endpoint_id':
+    return 'chip::EndpointId';
+  case 'group_id':
+    return 'chip::GroupId';
   case 'attribute_id':
     return 'chip::AttributeId';
   case 'cluster_id':

diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js
@@ -22,7 +22,8 @@ const templateUtil = require(zapPath + 'generator/template-util.js')
 const zclHelper    = require(zapPath + 'generator/helper-zcl.js')
 const zclQuery     = require(zapPath + 'db/query-zcl.js')
 
-const StringHelper = require('../../common/StringHelper.js');
+const StringHelper    = require('../../common/StringHelper.js');
+const ChipTypesHelper = require('../../common/ChipTypesHelper.js');
 
 /**
  * Check if the cluster (name) has any enabled manufacturer commands. This works only inside
@@ -127,7 +128,8 @@ function asReadType(type)
   {
     const options = { 'hash' : {} };
     return zclHelper.asUnderlyingZclType.call(this, type, options).then(zclType => {
-      switch (zclType) {
+      const basicType = ChipTypesHelper.asBasicType(zclType);
+      switch (basicType) {
       case 'int8_t':
       case 'uint8_t':
         return 'Int8u';