Introduce ClusterId_t and AttributeId_t

Author: kedars

src/lib/datamodel/Attribute.h

@@ -32,6 +32,7 @@
 namespace chip {
 namespace DataModel {
 
+typedef uint16_t AttributeId_t;
 /**
  * @brief
  *   This class implements a single attribute.
@@ -43,14 +44,16 @@ class Attribute
     friend class Cluster;
 
 public:
-    uint16_t mAttrId;
+    AttributeId_t mAttrId;
     Value mValue;
     Value mMin;
     Value mMax;
 
-    Attribute(uint16_t attrId, ValueTypes type) : mDeque(this), mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
-    Attribute(uint16_t attrId, Value value) : mDeque(this), mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
-    Attribute(uint16_t attrId, ValueTypes type, uint64_t min, uint64_t max) :
+    Attribute(AttributeId_t attrId, ValueTypes type) : mDeque(this), mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
+    Attribute(AttributeId_t attrId, Value value) :
+        mDeque(this), mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType)
+    {}
+    Attribute(AttributeId_t attrId, ValueTypes type, uint64_t min, uint64_t max) :
         mDeque(this), mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
     {}
 

src/lib/datamodel/Cluster.h

@@ -30,6 +30,7 @@
 namespace chip {
 namespace DataModel {
 
+typedef uint16_t ClusterId_t;
 /**
  * @brief
  *   This class implements the cluster object that maintains its attributes. Typically specific
@@ -38,10 +39,10 @@ namespace DataModel {
 class Cluster : public Deque<Cluster>
 {
 public:
-    uint16_t mClusterId;
+    ClusterId_t mClusterId;
     Deque<Attribute> mAttrs;
 
-    Cluster(uint16_t clusterId) : Deque(this), mClusterId(clusterId), mAttrs(nullptr) {}
+    Cluster(ClusterId_t clusterId) : Deque(this), mClusterId(clusterId), mAttrs(nullptr) {}
 
     virtual ~Cluster() {}
 
@@ -63,7 +64,7 @@ class Cluster : public Deque<Cluster>
      *
      * @param attrId the attribute identifer that we are looking for
      */
-    Attribute * GetAttribute(uint16_t attrId)
+    Attribute * GetAttribute(AttributeId_t attrId)
     {
         return mAttrs.Find([attrId](Attribute * item) -> bool { return (item->mAttrId == attrId); });
     }
@@ -75,7 +76,7 @@ class Cluster : public Deque<Cluster>
      * @param attrId the attribute identifer that should be set
      * @param value  the new value that the attribute should be updated with
      */
-    virtual CHIP_ERROR Set(uint16_t attrId, const Value & value)
+    virtual CHIP_ERROR Set(AttributeId_t attrId, const Value & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
@@ -93,7 +94,7 @@ class Cluster : public Deque<Cluster>
      * @param attrId the attribute identifer that should be queried
      * @param value  the value that the attribute has
      */
-    virtual CHIP_ERROR Get(uint16_t attrId, Value & value)
+    virtual CHIP_ERROR Get(AttributeId_t attrId, Value & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);

src/lib/datamodel/ClusterBasic.h

@@ -30,13 +30,13 @@ namespace chip {
 namespace DataModel {
 
 /* Cluster ID */
-static const uint16_t kClusterIdBase = 0x0000;
+static const ClusterId_t kClusterIdBase = 0x0000;
 
 /* Attribute IDs */
-static const uint16_t kAttributeIdZCLVersion         = 0x0000;
-static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static const uint16_t kAttributeIdStackVersion       = 0x0002;
-static const uint16_t kAttributeIdHWVersion          = 0x0003;
+static const AttributeId_t kAttributeIdZCLVersion         = 0x0000;
+static const AttributeId_t kAttributeIdApplicationVersion = 0x0001;
+static const AttributeId_t kAttributeIdStackVersion       = 0x0002;
+static const AttributeId_t kAttributeIdHWVersion          = 0x0003;
 
 /**
  * @brief

src/lib/datamodel/ClusterOnOff.h

@@ -30,13 +30,13 @@ namespace chip {
 namespace DataModel {
 
 /* Cluster ID */
-static const uint16_t kClusterIdOnOff = 0x0006;
+static const ClusterId_t kClusterIdOnOff = 0x0006;
 
 /* Attribute IDs */
-static const uint16_t kAttributeIdOnOff              = 0x0000;
-static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
-static const uint16_t kAttributeIdOnTime             = 0x4001;
-static const uint16_t kAttributeIdOffWaitTime        = 0x4002;
+static const AttributeId_t kAttributeIdOnOff              = 0x0000;
+static const AttributeId_t kAttributeIdGlobalSceneControl = 0x4000;
+static const AttributeId_t kAttributeIdOnTime             = 0x4001;
+static const AttributeId_t kAttributeIdOffWaitTime        = 0x4002;
 
 /**
  * @brief