From 10e1df4c442a23ca5e53100d64b46f9be9c8642e Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 10 Jul 2020 14:34:44 +0530
Subject: [PATCH 01/74] Prefix simulated datamodel with 'App' to avoid
 conflicts

---
 .../wifi-echo/server/esp32/main/wifi-echo.cpp | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 3410e1d12dd3db..4ba30667cc5175 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -111,37 +111,37 @@ std::vector<Button> buttons          = { Button(), Button(), Button() };
 std::vector<gpio_num_t> button_gpios = { BUTTON_1_GPIO_NUM, BUTTON_2_GPIO_NUM, BUTTON_3_GPIO_NUM };
 
 // Pretend these are devices with endpoints with clusters with attributes
-typedef std::tuple<std::string, std::string> Attribute;
-typedef std::vector<Attribute> Attributes;
-typedef std::tuple<std::string, Attributes> Cluster;
-typedef std::vector<Cluster> Clusters;
-typedef std::tuple<std::string, Clusters> Endpoint;
-typedef std::vector<Endpoint> Endpoints;
-typedef std::tuple<std::string, Endpoints> Device;
+typedef std::tuple<std::string, std::string> AppAttribute;
+typedef std::vector<AppAttribute> AppAttributes;
+typedef std::tuple<std::string, AppAttributes> AppCluster;
+typedef std::vector<AppCluster> AppClusters;
+typedef std::tuple<std::string, AppClusters> AppEndpoint;
+typedef std::vector<AppEndpoint> AppEndpoints;
+typedef std::tuple<std::string, AppEndpoints> Device;
 typedef std::vector<Device> Devices;
 Devices devices;
 
 void AddAttribute(std::string name, std::string value)
 {
-    Attribute attribute = std::make_tuple(std::move(name), std::move(value));
+    AppAttribute attribute = std::make_tuple(std::move(name), std::move(value));
     std::get<1>(std::get<1>(std::get<1>(devices.back()).back()).back()).emplace_back(std::move(attribute));
 }
 
 void AddCluster(std::string name)
 {
-    Cluster cluster = std::make_tuple(std::move(name), std::move(Attributes()));
+    AppCluster cluster = std::make_tuple(std::move(name), std::move(AppAttributes()));
     std::get<1>(std::get<1>(devices.back()).back()).emplace_back(std::move(cluster));
 }
 
 void AddEndpoint(std::string name)
 {
-    Endpoint endpoint = std::make_tuple(std::move(name), std::move(Clusters()));
+    AppEndpoint endpoint = std::make_tuple(std::move(name), std::move(AppClusters()));
     std::get<1>(devices.back()).emplace_back(std::move(endpoint));
 }
 
 void AddDevice(std::string name)
 {
-    Device device = std::make_tuple(std::move(name), std::move(Endpoints()));
+    Device device = std::make_tuple(std::move(name), std::move(AppEndpoints()));
     devices.emplace_back(std::move(device));
 }
 

From 4cca13d9f34c69d755a2d113d3fde068135d462d Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 2 Jul 2020 22:45:18 +0530
Subject: [PATCH 02/74] Create baseline classes for 'Value' and 'Attribute'

---
 src/lib/core/CHIPAttributes.h | 48 +++++++++++++++++++++
 src/lib/core/CHIPValues.h     | 78 +++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 src/lib/core/CHIPAttributes.h
 create mode 100644 src/lib/core/CHIPValues.h

diff --git a/src/lib/core/CHIPAttributes.h b/src/lib/core/CHIPAttributes.h
new file mode 100644
index 00000000000000..c3cc7ca05b0e2c
--- /dev/null
+++ b/src/lib/core/CHIPAttributes.h
@@ -0,0 +1,48 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for working with CHIP values.
+ *
+ */
+
+#ifndef CHIPATTRIBUTES_H_
+#define CHIPATTRIBUTES_H_
+
+#include <lib/core/CHIPValues.h>
+
+namespace chip {
+namespace DataModel {
+
+template <typename ValueType, typename BaseValueType>
+class CHIPAttribute
+{
+public:
+    ValueType mValue;
+    CHIPAttribute() {}
+    CHIPAttribute(BaseValueType value) : mValue(value) {}
+    CHIPAttribute(BaseValueType value, BaseValueType min, BaseValueType max) : mValue(value, min, max) {}
+};
+
+typedef class CHIPAttribute<CHIPValue_UInt32_t, uint32_t> CHIPAttribute_UInt32_t;
+typedef class CHIPAttribute<CHIPValue_Bool_t, bool> CHIPAttribute_Bool_t;
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPATTRIBUTES_H_ */
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
new file mode 100644
index 00000000000000..b214892bd770dc
--- /dev/null
+++ b/src/lib/core/CHIPValues.h
@@ -0,0 +1,78 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for working with CHIP values.
+ *
+ */
+
+#ifndef CHIPVALUES_H_
+#define CHIPVALUES_H_
+
+namespace chip {
+namespace DataModel {
+
+enum CHIPValueTypes
+{
+    kCHIPValueType_NotSpecified           = -1,
+    kCHIPValueType_Int8,
+    kCHIPValueType_Int16,
+    kCHIPValueType_Int32,
+    kCHIPValueType_Int64,
+    kCHIPValueType_UInt8,
+    kCHIPValueType_UInt16,
+    kCHIPValueType_UInt32,
+    kCHIPValueType_UInt64,
+    kCHIPValueType_Bool,
+    kCHIPValueType_FloatingPointNumber32,
+    kCHIPValueType_FloatingPointNumber64,
+    kCHIPValueType_UTF8String_1ByteLength,
+    kCHIPValueType_UTF8String_2ByteLength,
+    kCHIPValueType_UTF8String_4ByteLength,
+    kCHIPValueType_UTF8String_8ByteLength,
+    kCHIPValueType_ByteString_1ByteLength,
+    kCHIPValueType_ByteString_2ByteLength,
+    kCHIPValueType_ByteString_4ByteLength,
+    kCHIPValueType_ByteString_8ByteLength,
+    kCHIPValueType_Null,
+    kCHIPValueType_EndOfContainer,
+};
+
+template <enum CHIPValueTypes EnumType, typename ValueType>
+class CHIPValue
+{
+public:
+    CHIPValueTypes mType;
+    ValueType mValue;
+    ValueType mMin;
+    ValueType mMax;
+    
+    CHIPValue() : mType(EnumType) {}
+    CHIPValue(ValueType value) : mType(EnumType), mValue(value) {}
+    CHIPValue(ValueType value, ValueType min, ValueType max) : mType(EnumType),
+                                                               mValue(value),
+                                                               mMin(min),
+                                                               mMax(max) {}
+};
+
+typedef class CHIPValue<kCHIPValueType_UInt32, uint32_t> CHIPValue_UInt32_t;
+typedef class CHIPValue<kCHIPValueType_Bool, bool> CHIPValue_Bool_t;
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPVALUES_H_ */

From 3d409c8467975611e6675091c7d2a4ed8eba3ae9 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 3 Jul 2020 20:39:45 +0530
Subject: [PATCH 03/74] Use enum instead of template

---
 src/lib/core/CHIPAttributes.h |  36 ++++++++---
 src/lib/core/CHIPValues.h     | 109 ++++++++++++++++++++++++++++++----
 2 files changed, 125 insertions(+), 20 deletions(-)

diff --git a/src/lib/core/CHIPAttributes.h b/src/lib/core/CHIPAttributes.h
index c3cc7ca05b0e2c..5ef29c3ffb2f8d 100644
--- a/src/lib/core/CHIPAttributes.h
+++ b/src/lib/core/CHIPAttributes.h
@@ -29,18 +29,40 @@
 namespace chip {
 namespace DataModel {
 
-template <typename ValueType, typename BaseValueType>
+
 class CHIPAttribute
 {
 public:
-    ValueType mValue;
-    CHIPAttribute() {}
-    CHIPAttribute(BaseValueType value) : mValue(value) {}
-    CHIPAttribute(BaseValueType value, BaseValueType min, BaseValueType max) : mValue(value, min, max) {}
+    CHIPAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
+    CHIPAttribute(uint16_t attrId, CHIPValue min, CHIPValue max) : mAttrId(attrId), mValue(min.mType), mMin(min), mMax(max) {}
+
+    int Set(CHIPValue newValue)
+    {
+        if (mValue.mType != newValue.mType)
+        {
+            return FAIL;
+        }
+        if (newValue < mMin ||
+            newValue > mMax)
+        {
+            return FAIL;
+        }
+        mValue = newValue;
+        return SUCCESS;
+    }
+
+    CHIPValue Get()
+    {
+        return mValue;
+    }
+
+private:
+    uint16_t         mAttrId;
+    CHIPValue        mValue;
+    CHIPValue        mMin;
+    CHIPValue        mMax;
 };
 
-typedef class CHIPAttribute<CHIPValue_UInt32_t, uint32_t> CHIPAttribute_UInt32_t;
-typedef class CHIPAttribute<CHIPValue_Bool_t, bool> CHIPAttribute_Bool_t;
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
index b214892bd770dc..96e8d97d21aadc 100644
--- a/src/lib/core/CHIPValues.h
+++ b/src/lib/core/CHIPValues.h
@@ -27,6 +27,10 @@
 namespace chip {
 namespace DataModel {
 
+/* XXX Remove later*/
+#define SUCCESS 0
+#define FAIL    -1
+
 enum CHIPValueTypes
 {
     kCHIPValueType_NotSpecified           = -1,
@@ -53,25 +57,104 @@ enum CHIPValueTypes
     kCHIPValueType_EndOfContainer,
 };
 
-template <enum CHIPValueTypes EnumType, typename ValueType>
 class CHIPValue
 {
 public:
     CHIPValueTypes mType;
-    ValueType mValue;
-    ValueType mMin;
-    ValueType mMax;
-    
-    CHIPValue() : mType(EnumType) {}
-    CHIPValue(ValueType value) : mType(EnumType), mValue(value) {}
-    CHIPValue(ValueType value, ValueType min, ValueType max) : mType(EnumType),
-                                                               mValue(value),
-                                                               mMin(min),
-                                                               mMax(max) {}
+    union {
+        uint64_t Int64;
+    };
+    CHIPValue(CHIPValueTypes type) : mType(type) {}
+    CHIPValue(uint32_t value) : mType(kCHIPValueType_UInt32), Int64((uint64_t)value) {}
+    CHIPValue(bool value) : mType(kCHIPValueType_Bool), Int64((uint64_t)value) {}
+
+    int Set(uint32_t &value)
+    {
+        if (mType != kCHIPValueType_UInt32)
+            return FAIL;
+        Int64 = (uint64_t)value;
+        return SUCCESS;
+    }
+
+    int Set(bool &value)
+    {
+        if (mType != kCHIPValueType_Bool)
+            return FAIL;
+        Int64 = (uint64_t)value;
+        return SUCCESS;
+    }
+
+    int Get(uint32_t &value)
+    {
+        if (mType != kCHIPValueType_UInt32)
+            return FAIL;
+        value = (uint32_t)Int64;
+        return SUCCESS;
+    }
+
+    int Get(bool &value)
+    {
+        if (mType != kCHIPValueType_Bool)
+            return FAIL;
+        value = (bool)Int64;
+        return SUCCESS;
+    }
+
+    bool operator <(const CHIPValue& value)
+    {
+        if (mType != value.mType)
+        {
+            return false;
+        }
+        switch (mType)
+        {
+        case kCHIPValueType_Int8:
+        case kCHIPValueType_Int16:
+        case kCHIPValueType_Int32:
+        case kCHIPValueType_Int64:
+        case kCHIPValueType_UInt8:
+        case kCHIPValueType_UInt16:
+        case kCHIPValueType_UInt32:
+        case kCHIPValueType_UInt64:
+        case kCHIPValueType_Bool:
+            return Int64 < value.Int64;
+            break;
+        default:
+            return false;
+        }
+        return false;
+    }
+
+    bool operator >(const CHIPValue& value)
+    {
+        if (mType != value.mType)
+        {
+            return false;
+        }
+        switch (mType)
+        {
+        case kCHIPValueType_Int8:
+        case kCHIPValueType_Int16:
+        case kCHIPValueType_Int32:
+        case kCHIPValueType_Int64:
+        case kCHIPValueType_UInt8:
+        case kCHIPValueType_UInt16:
+        case kCHIPValueType_UInt32:
+        case kCHIPValueType_UInt64:
+        case kCHIPValueType_Bool:
+            return Int64 > value.Int64;
+            break;
+        default:
+            return false;
+        }
+        return false;
+    }
+
+private:
+    CHIPValue() {}
+
 };
 
-typedef class CHIPValue<kCHIPValueType_UInt32, uint32_t> CHIPValue_UInt32_t;
-typedef class CHIPValue<kCHIPValueType_Bool, bool> CHIPValue_Bool_t;
 } // namespace DataModel
 } // namespace chip
 

From eb9c4120272321080ea81bc1d8c40075606766e4 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 5 Jul 2020 19:26:47 +0530
Subject: [PATCH 04/74] Get a basic Cluster Server structure

---
 .../wifi-echo/server/esp32/main/wifi-echo.cpp |  49 +++++++
 src/lib/core/CHIPAttributes.h                 |  70 ----------
 src/lib/core/CHIPBaseAttribute.h              | 123 ++++++++++++++++++
 src/lib/core/CHIPBaseCluster.h                |  72 ++++++++++
 src/lib/core/CHIPClusterServer.h              |  90 +++++++++++++
 src/lib/core/CHIPEndPoint.cpp                 |  32 +++++
 src/lib/core/CHIPEndPoint.h                   |  84 ++++++++++++
 src/lib/core/CHIPStandardAttributes.h         | 122 +++++++++++++++++
 src/lib/core/CHIPStandardClusters.h           |  61 +++++++++
 src/lib/core/CHIPValues.h                     | 106 ++++++---------
 src/lib/core/CoreLayer.am                     |   8 ++
 11 files changed, 678 insertions(+), 139 deletions(-)
 delete mode 100644 src/lib/core/CHIPAttributes.h
 create mode 100644 src/lib/core/CHIPBaseAttribute.h
 create mode 100644 src/lib/core/CHIPBaseCluster.h
 create mode 100644 src/lib/core/CHIPClusterServer.h
 create mode 100644 src/lib/core/CHIPEndPoint.cpp
 create mode 100644 src/lib/core/CHIPEndPoint.h
 create mode 100644 src/lib/core/CHIPStandardAttributes.h
 create mode 100644 src/lib/core/CHIPStandardClusters.h

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 4ba30667cc5175..7df77f38bd61bb 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -46,9 +46,11 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/ErrorStr.h>
 #include <transport/SecureSessionMgr.h>
+#include <lib/core/CHIPClusterServer.h>
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::DataModel;
 
 extern void startServer();
 
@@ -352,6 +354,42 @@ std::string createSetupPayload()
 
 } // namespace
 
+void PrintDataModel(CHIPClusterServer & server)
+{
+    printf("Server:\n");
+    for (int i = 0; i < kMaxEndPointPerServer; i++)
+    {
+        /* EndPoints */
+        if (server.mEndPoints[i])
+        {
+            auto endpoint = server.mEndPoints[i];
+            printf("  EndPoint: %d\n", i);
+            for (int j = 0; j < kMaxClustersPerEndPoint; j++)
+            {
+                /* Clusters */
+                if (endpoint->mClusters[j])
+                {
+                    auto cluster = endpoint->mClusters[j];
+                    printf("    ClusterId: 0x%04x\n", cluster->mClusterId);
+                    for (int k = 0; k < kMaxAttributesPerCluster; k++)
+                    {
+                        /* Attributes */
+                        if (cluster->mAttrs[k])
+                        {
+                            auto attr = cluster->mAttrs[k];
+                            printf("      Attribute: 0x%04x\n", attr->mAttrId);
+                            char printstr[20];
+                            attr->mValue.ValueToStr(printstr, sizeof(printstr));
+                            printf("              Value: %s\n", printstr);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 extern "C" void app_main()
 {
     ESP_LOGI(TAG, "WiFi Echo Demo!");
@@ -396,6 +434,17 @@ extern "C" void app_main()
 
     statusLED.Init(STATUS_LED_GPIO_NUM);
 
+    uint8_t ZCLVersion = 10;
+    uint8_t applicationVersion = 20;
+    uint8_t stackVersion = 1;
+    uint8_t HWVersion = 1;
+    CHIPClusterServer server(ZCLVersion,
+                             applicationVersion,
+                             stackVersion,
+                             HWVersion);
+    /* Add a cluster to the primary endpoint of our cluster server */
+    server.AddCluster(CHIPClusterOnOffNew());
+
     // Start the Echo Server
     InitDataModelHandler();
     startServer();
diff --git a/src/lib/core/CHIPAttributes.h b/src/lib/core/CHIPAttributes.h
deleted file mode 100644
index 5ef29c3ffb2f8d..00000000000000
--- a/src/lib/core/CHIPAttributes.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 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.
- */
-
-/**
- *    @file
- *      This file contains definitions for working with CHIP values.
- *
- */
-
-#ifndef CHIPATTRIBUTES_H_
-#define CHIPATTRIBUTES_H_
-
-#include <lib/core/CHIPValues.h>
-
-namespace chip {
-namespace DataModel {
-
-
-class CHIPAttribute
-{
-public:
-    CHIPAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
-    CHIPAttribute(uint16_t attrId, CHIPValue min, CHIPValue max) : mAttrId(attrId), mValue(min.mType), mMin(min), mMax(max) {}
-
-    int Set(CHIPValue newValue)
-    {
-        if (mValue.mType != newValue.mType)
-        {
-            return FAIL;
-        }
-        if (newValue < mMin ||
-            newValue > mMax)
-        {
-            return FAIL;
-        }
-        mValue = newValue;
-        return SUCCESS;
-    }
-
-    CHIPValue Get()
-    {
-        return mValue;
-    }
-
-private:
-    uint16_t         mAttrId;
-    CHIPValue        mValue;
-    CHIPValue        mMin;
-    CHIPValue        mMax;
-};
-
-
-} // namespace DataModel
-} // namespace chip
-
-#endif /* CHIPATTRIBUTES_H_ */
diff --git a/src/lib/core/CHIPBaseAttribute.h b/src/lib/core/CHIPBaseAttribute.h
new file mode 100644
index 00000000000000..923a78e694d12c
--- /dev/null
+++ b/src/lib/core/CHIPBaseAttribute.h
@@ -0,0 +1,123 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for working with CHIP values.
+ *
+ */
+
+#ifndef CHIPATTRIBUTES_H_
+#define CHIPATTRIBUTES_H_
+
+#include <lib/core/CHIPValues.h>
+
+namespace chip {
+namespace DataModel {
+
+
+class CHIPBaseAttribute
+{
+public:
+    uint16_t         mAttrId;
+    CHIPValue        mValue;
+    CHIPValue        mMin;
+    CHIPValue        mMax;
+
+    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId),
+        mValue(type),
+        mMin(type),
+        mMax(type) {}
+    CHIPBaseAttribute(uint16_t attrId, CHIPValue value) : mAttrId(attrId),
+        mValue(value),
+        mMin(value.mType),
+        mMax(value.mType) {}
+    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type, uint64_t min, uint64_t max) : mAttrId(attrId),
+        mValue(type),
+        mMin(type, min),
+        mMax(type, max) {}
+
+    /* An attribute is typically set in either of the following 2 ways:
+     *
+     * - From the top of the stack or the most derived class, like
+     *   brightness.Set(45). This is handled through the derived
+     *   class's Set method.
+     *
+     * - From the bottom of the stack when the stack receives a schema
+     *   with just a list of values. This will typically get called
+     *   with a Set() call on the base-ptr. In this case the argument
+     *   will be CHIPValue.
+     */
+    int Set(CHIPValue newValue)
+    {
+        /* We have to check the element type match in this case */
+        if (mValue.mType != newValue.mType)
+        {
+            return FAIL;
+        }
+        if (withinRange(newValue))
+        {
+            mValue = newValue;
+            return SUCCESS;
+        }
+        return FAIL;
+    }
+
+    /* Need to define the behaviour when CHIPValue contains pointers
+     * to allocated data
+     */
+    CHIPValue Get()
+    {
+        return mValue;
+    }
+
+protected:
+    bool withinRange(const uint64_t &value)
+    {
+        return (value >= mMin.Int64) &&
+            (value <= mMax.Int64);
+    }
+
+    bool withinRange(const CHIPValue value)
+    {
+        switch (mValue.mType)
+        {
+        case kCHIPValueType_Int8:
+        case kCHIPValueType_Int16:
+        case kCHIPValueType_Int32:
+        case kCHIPValueType_Int64:
+        case kCHIPValueType_UInt8:
+        case kCHIPValueType_UInt16:
+        case kCHIPValueType_UInt32:
+        case kCHIPValueType_UInt64:
+            return withinRange(value.Int64);
+            break;
+        case kCHIPValueType_Bool:
+            return true;
+        default:
+            return false;
+        }
+        return false;
+    }
+
+};
+
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPATTRIBUTES_H_ */
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/core/CHIPBaseCluster.h
new file mode 100644
index 00000000000000..15d1e8ae4acf5c
--- /dev/null
+++ b/src/lib/core/CHIPBaseCluster.h
@@ -0,0 +1,72 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains base class for CHIP Clusters
+ *
+ */
+
+#ifndef CHIPBASECLUSTER_H_
+#define CHIPBASECLUSTER_H_
+
+#include <lib/core/CHIPBaseAttribute.h>
+
+namespace chip {
+namespace DataModel {
+
+/* TODO: To be converted to a template version or Kconfig later on */
+static const uint8_t kMaxAttributesPerCluster = 10;
+class CHIPBaseCluster
+{
+public:
+    uint16_t           mClusterId;
+    CHIPBaseAttribute *mAttrs[kMaxAttributesPerCluster];
+
+    CHIPBaseCluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
+
+    virtual ~CHIPBaseCluster()
+    {
+        for (int i = 0; i < kMaxAttributesPerCluster; i++)
+        {
+            if (mAttrs[i] != nullptr)
+            {
+                delete mAttrs[i];
+                mAttrs[i] = nullptr;
+            }
+        }
+    }
+
+    int AddAttribute(CHIPBaseAttribute *attr)
+    {
+        for (int i = 0; i < kMaxAttributesPerCluster; i++)
+        {
+            if (mAttrs[i] == nullptr)
+            {
+                mAttrs[i] = attr;
+                return SUCCESS;
+            }
+        }
+        return FAIL;
+    }
+};
+
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPBASECLUSTER_H_ */
diff --git a/src/lib/core/CHIPClusterServer.h b/src/lib/core/CHIPClusterServer.h
new file mode 100644
index 00000000000000..3dcc712ddb90e4
--- /dev/null
+++ b/src/lib/core/CHIPClusterServer.h
@@ -0,0 +1,90 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains the ClusterServer class. The ClusterServer
+ *      maintains all the cluster servers that this devices exposes.
+ *
+ */
+
+#ifndef CHIPCLUSTERSERVER_H_
+#define CHIPCLUSTERSERVER_H_
+
+
+#include <lib/core/CHIPEndPoint.h>
+
+namespace chip {
+namespace DataModel {
+
+/* TODO: To be converted to a template version or Kconfig later on */
+static const uint8_t kMaxEndPointPerServer = 5;
+class CHIPClusterServer
+{
+public:
+    CHIPEndPoint *mEndPoints[kMaxEndPointPerServer];
+
+    CHIPClusterServer(uint8_t ZCLVersion,
+                      uint8_t applicationVersion,
+                      uint8_t stackVersion,
+                      uint8_t HWVersion) : mEndPoints()
+    {
+        mEndPoints[0] = new CHIPEndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    }
+
+    virtual ~CHIPClusterServer()
+    {
+        for (int i = 1; i < kMaxEndPointPerServer; i++)
+        {
+            if (mEndPoints[i] != nullptr)
+            {
+                delete mEndPoints[i];
+                mEndPoints[i] = nullptr;
+            }
+        }
+    }
+
+    /* By default always add to the 0th endpoint, for simplicity */
+    int AddCluster(CHIPBaseCluster *cluster)
+    {
+        if (!cluster)
+        {
+            return FAIL;
+        }
+
+        return mEndPoints[0]->AddCluster(cluster);
+    }
+
+    int AddEndPoint(CHIPEndPoint *endPoint)
+    {
+        for (int i = 0; i < kMaxEndPointPerServer; i++)
+        {
+            if (mEndPoints[i] == nullptr)
+            {
+                mEndPoints[i] = endPoint;
+                return SUCCESS;
+            }
+        }
+        return FAIL;
+    }
+};
+
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPCLUSTERSERVER_H_ */
diff --git a/src/lib/core/CHIPEndPoint.cpp b/src/lib/core/CHIPEndPoint.cpp
new file mode 100644
index 00000000000000..b3f6103b6cb8ca
--- /dev/null
+++ b/src/lib/core/CHIPEndPoint.cpp
@@ -0,0 +1,32 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file implements the CHIPEndPoint class
+ *
+ */
+
+#include <lib/core/CHIPEndPoint.h>
+
+namespace chip {
+namespace DataModel {
+
+CHIPBaseCluster *CHIPEndPoint::mBasicCluster = nullptr;
+
+} // namespace DataModel
+} // namespace chip
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/core/CHIPEndPoint.h
new file mode 100644
index 00000000000000..7fdad4ca8256d4
--- /dev/null
+++ b/src/lib/core/CHIPEndPoint.h
@@ -0,0 +1,84 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains the EndPoint class
+ *
+ */
+
+#ifndef CHIPENDPOINT_H_
+#define CHIPENDPOINT_H_
+
+#include <lib/core/CHIPBaseAttribute.h>
+#include <lib/core/CHIPStandardClusters.h>
+
+namespace chip {
+namespace DataModel {
+
+/* TODO: To be converted to a template version or Kconfig later on */
+static const uint8_t kMaxClustersPerEndPoint = 5;
+class CHIPEndPoint
+{
+public:
+    static CHIPBaseCluster *mBasicCluster;
+    CHIPBaseCluster        *mClusters[kMaxClustersPerEndPoint];
+
+    CHIPEndPoint(uint8_t ZCLVersion,
+                 uint8_t applicationVersion,
+                 uint8_t stackVersion,
+                 uint8_t HWVersion) : mClusters()
+    {
+        if (mBasicCluster == nullptr)
+        {
+            mBasicCluster = CHIPClusterBasicNew(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+            /* TODO: allocation failure? */
+        }
+        mClusters[0] = mBasicCluster;
+    }
+
+    virtual ~CHIPEndPoint()
+    {
+        for (int i = 1; i < kMaxClustersPerEndPoint; i++)
+        {
+            if (mClusters[i] != nullptr)
+            {
+                delete mClusters[i];
+                mClusters[i] = nullptr;
+            }
+        }
+    }
+
+    int AddCluster(CHIPBaseCluster *cluster)
+    {
+        for (int i = 0; i < kMaxClustersPerEndPoint; i++)
+        {
+            if (mClusters[i] == nullptr)
+            {
+                mClusters[i] = cluster;
+                return SUCCESS;
+            }
+        }
+        return FAIL;
+    }
+};
+
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPENDPOINT_H_ */
diff --git a/src/lib/core/CHIPStandardAttributes.h b/src/lib/core/CHIPStandardAttributes.h
new file mode 100644
index 00000000000000..93b97fa4f1541f
--- /dev/null
+++ b/src/lib/core/CHIPStandardAttributes.h
@@ -0,0 +1,122 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for standard CHIP Attributes
+ *
+ */
+
+#ifndef CHIPSTANDARDATTRIBUTES_H_
+#define CHIPSTANDARDATTRIBUTES_H_
+
+#include <lib/core/CHIPBaseAttribute.h>
+
+namespace chip {
+namespace DataModel {
+#if 0
+template <typename AttrId, typename CHIPTypeName, typename TypeName>
+class CHIPSimpleAttribute : public CHIPBaseAttribute
+{
+ public:
+ CHIPSimpleAttribute() : CHIPBaseAttribute(AttrId, CHIPTypeName) {}
+
+ int Set(const TypeName newValue)
+ {
+     return CHIPBaseAttribute::Set(newValue);
+ }
+ bool Get()
+ {
+     TypeName value;
+     CHIPBaseAttribute::Get(value);
+     return value;
+ }
+};
+
+template <typename AttrId, typename CHIPTypeName, typename TypeName, typename MinRange, typename MaxRange>
+class CHIPRangeAttribute : public CHIPBaseAttribute
+{
+ public:
+ CHIPSimpleAttribute() : CHIPBaseAttribute(AttrId, CHIPTypeName, MinRange, MaxRange) {}
+
+ int Set(const TypeName newValue)
+ {
+     return CHIPBaseAttribute::Set(newValue);
+ }
+ bool Get()
+ {
+     TypeName value;
+     CHIPBaseAttribute::Get(value);
+     return value;
+ }
+};
+
+/* This will mostly be auto-generated */
+using CHIPAttributeOnOff = class CHIPSimpleAttribute<0x0000, kCHIPValueType_Bool, bool>;
+using CHIPAttributeGlobalSceneControl = class CHIPSimpleAttribute<0x4000, kCHIPValueType_Bool, bool>;
+using CHIPAttributeOnTime = class CHIPSimpleAttribute<0x4001, kCHIPValueType_UInt16, uint16_t>;
+using CHIPAttributeOffWaitTime = class CHIPSimpleAttribute<0x4002, kCHIPValueType_UInt16, uint16_t>;
+#endif
+
+/* TODO: It would be nice to use a pool allocator here once we have one */
+/* Base Cluster */
+static inline CHIPBaseAttribute *CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
+{
+    return new CHIPBaseAttribute(0x0000, CHIPValueUInt8(ZCLVersion));
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
+{
+    return new CHIPBaseAttribute(0x0001, CHIPValueUInt8(applicationVersion));
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeStackVersionNew(uint8_t stackVersion)
+{
+    return new CHIPBaseAttribute(0x0002, CHIPValueUInt8(stackVersion));
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeHWVersionNew(uint8_t HWVersion)
+{
+    return new CHIPBaseAttribute(0x0003, CHIPValueUInt8(HWVersion));
+}
+
+
+/* On/Off Cluster */
+static inline CHIPBaseAttribute *CHIPAttributeOnOffNew(void)
+{
+    return new CHIPBaseAttribute(0x0000, kCHIPValueType_Bool);
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeGlobalSceneControlNew(void)
+{
+    return new CHIPBaseAttribute(0x4000, kCHIPValueType_Bool);
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeOnTimeNew(void)
+{
+    return new CHIPBaseAttribute(0x4001, kCHIPValueType_UInt16);
+}
+
+static inline CHIPBaseAttribute *CHIPAttributeOffWaitTimeNew(void)
+{
+    return new CHIPBaseAttribute(0x4002, kCHIPValueType_UInt16);
+}
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPSTANDARDATTRIBUTES_H_ */
diff --git a/src/lib/core/CHIPStandardClusters.h b/src/lib/core/CHIPStandardClusters.h
new file mode 100644
index 00000000000000..3345e9cd8d2589
--- /dev/null
+++ b/src/lib/core/CHIPStandardClusters.h
@@ -0,0 +1,61 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for standard CHIP Clusters
+ *
+ */
+
+#ifndef CHIPSTANDARDCLUSTERS_H_
+#define CHIPSTANDARDCLUSTERS_H_
+
+#include <lib/core/CHIPBaseCluster.h>
+#include <lib/core/CHIPStandardAttributes.h>
+
+namespace chip {
+namespace DataModel {
+
+/* Base Cluster */
+    static inline CHIPBaseCluster *CHIPClusterBasicNew(uint8_t ZCLVersion,
+                                                       uint8_t applicationVersion,
+                                                       uint8_t stackVersion,
+                                                       uint8_t HWVersion)
+{
+    CHIPBaseCluster *cluster = new CHIPBaseCluster(0x0000);
+    cluster->AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
+    cluster->AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
+    cluster->AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
+    cluster->AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
+    return cluster;
+}
+
+/* On/Off Cluster */
+static inline CHIPBaseCluster *CHIPClusterOnOffNew(void)
+{
+    CHIPBaseCluster *cluster = new CHIPBaseCluster(0x0006);
+    cluster->AddAttribute(CHIPAttributeOnOffNew());
+    cluster->AddAttribute(CHIPAttributeGlobalSceneControlNew());
+    cluster->AddAttribute(CHIPAttributeOnTimeNew());
+    cluster->AddAttribute(CHIPAttributeOffWaitTimeNew());
+    return cluster;
+}
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPSTANDARDCLUSTERS_H_ */
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
index 96e8d97d21aadc..4e23d4a594dfbd 100644
--- a/src/lib/core/CHIPValues.h
+++ b/src/lib/core/CHIPValues.h
@@ -24,6 +24,11 @@
 #ifndef CHIPVALUES_H_
 #define CHIPVALUES_H_
 
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdio.h>
+
 namespace chip {
 namespace DataModel {
 
@@ -64,48 +69,11 @@ class CHIPValue
     union {
         uint64_t Int64;
     };
-    CHIPValue(CHIPValueTypes type) : mType(type) {}
-    CHIPValue(uint32_t value) : mType(kCHIPValueType_UInt32), Int64((uint64_t)value) {}
-    CHIPValue(bool value) : mType(kCHIPValueType_Bool), Int64((uint64_t)value) {}
-
-    int Set(uint32_t &value)
-    {
-        if (mType != kCHIPValueType_UInt32)
-            return FAIL;
-        Int64 = (uint64_t)value;
-        return SUCCESS;
-    }
-
-    int Set(bool &value)
-    {
-        if (mType != kCHIPValueType_Bool)
-            return FAIL;
-        Int64 = (uint64_t)value;
-        return SUCCESS;
-    }
-
-    int Get(uint32_t &value)
-    {
-        if (mType != kCHIPValueType_UInt32)
-            return FAIL;
-        value = (uint32_t)Int64;
-        return SUCCESS;
-    }
-
-    int Get(bool &value)
-    {
-        if (mType != kCHIPValueType_Bool)
-            return FAIL;
-        value = (bool)Int64;
-        return SUCCESS;
-    }
+    CHIPValue(CHIPValueTypes type) : mType(type),Int64() {}
+    CHIPValue(CHIPValueTypes type, uint64_t int64Value) : mType(type), Int64(int64Value) {}
 
-    bool operator <(const CHIPValue& value)
+    void ValueToStr(char *buf, int maxlen)
     {
-        if (mType != value.mType)
-        {
-            return false;
-        }
         switch (mType)
         {
         case kCHIPValueType_Int8:
@@ -116,45 +84,45 @@ class CHIPValue
         case kCHIPValueType_UInt16:
         case kCHIPValueType_UInt32:
         case kCHIPValueType_UInt64:
-        case kCHIPValueType_Bool:
-            return Int64 < value.Int64;
+            snprintf(buf, maxlen, "%lld", Int64);
+            return;
             break;
-        default:
-            return false;
-        }
-        return false;
-    }
-
-    bool operator >(const CHIPValue& value)
-    {
-        if (mType != value.mType)
-        {
-            return false;
-        }
-        switch (mType)
-        {
-        case kCHIPValueType_Int8:
-        case kCHIPValueType_Int16:
-        case kCHIPValueType_Int32:
-        case kCHIPValueType_Int64:
-        case kCHIPValueType_UInt8:
-        case kCHIPValueType_UInt16:
-        case kCHIPValueType_UInt32:
-        case kCHIPValueType_UInt64:
         case kCHIPValueType_Bool:
-            return Int64 > value.Int64;
-            break;
+            snprintf(buf, maxlen, "%s", Int64 ? "true" : "false");
+            return;
         default:
-            return false;
+            buf[0] = '\0';
+            return;
         }
-        return false;
+        buf[0] = '\0';
+        return;
     }
-
 private:
     CHIPValue() {}
 
 };
 
+
+static inline CHIPValue CHIPValueBool(bool b)
+{
+    return CHIPValue(kCHIPValueType_Bool, (uint64_t)b);
+}
+
+static inline bool CHIPValueToBool(CHIPValue v)
+{
+    return (bool)v.Int64;
+}
+
+static inline CHIPValue CHIPValueUInt8(uint8_t b)
+{
+    return CHIPValue(kCHIPValueType_UInt8, (uint64_t)b);
+}
+
+static inline uint8_t CHIPValueToUInt8(CHIPValue v)
+{
+    return (uint8_t)v.Int64;
+}
+
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CoreLayer.am b/src/lib/core/CoreLayer.am
index a0dbfce75e0ab2..496c31a2bbb1d4 100644
--- a/src/lib/core/CoreLayer.am
+++ b/src/lib/core/CoreLayer.am
@@ -32,6 +32,7 @@ CHIP_BUILD_CORE_LAYER_SOURCE_FILES                        = \
     @top_builddir@/src/lib/core/CHIPTLVWriter.cpp           \
     @top_builddir@/src/lib/core/CHIPTLVUpdater.cpp          \
     @top_builddir@/src/lib/core/CHIPKeyIds.cpp              \
+    @top_builddir@/src/lib/core/CHIPEndPoint.cpp            \
     $(NULL)
 
 CHIP_BUILD_CORE_LAYER_HEADER_FILES                        = \
@@ -54,4 +55,11 @@ CHIP_BUILD_CORE_LAYER_HEADER_FILES                        = \
     @top_builddir@/src/lib/core/Optional.h                  \
     @top_builddir@/src/lib/core/ReferenceCounted.h          \
     @top_builddir@/src/lib/core/CHIPVendorIdentifiers.hpp   \
+    @top_builddir@/src/lib/core/CHIPBaseAttribute.h   \
+    @top_builddir@/src/lib/core/CHIPBaseCluster.h   \
+    @top_builddir@/src/lib/core/CHIPClusterServer.h   \
+    @top_builddir@/src/lib/core/CHIPEndPoint.h   \
+    @top_builddir@/src/lib/core/CHIPStandardAttributes.h   \
+    @top_builddir@/src/lib/core/CHIPStandardClusters.h   \
+    @top_builddir@/src/lib/core/CHIPValues.h   \
     $(NULL)

From a43a2c96d0a99729e9a37d485fc4d18a8053cbda Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 7 Jul 2020 18:11:51 +0530
Subject: [PATCH 05/74] Let LEDWidget class in wifi-echo implement the OnOff
 Cluster

Also some additional cleanups
---
 .../server/esp32/main/EchoDeviceCallbacks.cpp | 30 +++++----
 .../wifi-echo/server/esp32/main/LEDWidget.cpp | 16 ++++-
 .../server/esp32/main/include/LEDWidget.h     |  4 +-
 .../wifi-echo/server/esp32/main/wifi-echo.cpp | 18 +++---
 src/lib/core/CHIPBaseAttribute.h              |  2 +-
 src/lib/core/CHIPBaseCluster.h                | 24 ++++++++
 src/lib/core/CHIPEndPoint.h                   | 13 ++++
 src/lib/core/CHIPStandardAttributes.h         | 61 ++++---------------
 src/lib/core/CHIPStandardClusters.h           | 51 +++++++++-------
 src/lib/core/CHIPValues.h                     |  3 +-
 10 files changed, 126 insertions(+), 96 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index 1428c770658635..24c546b7d7e53b 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -27,6 +27,7 @@
 #include "esp_log.h"
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
+#include <lib/core/CHIPClusterServer.h>
 
 #include "LEDWidget.h"
 #include <inet/IPAddress.h>
@@ -34,6 +35,7 @@
 static const char * TAG = "echo-devicecallbacks";
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
+using namespace ::chip::DataModel;
 
 extern LEDWidget statusLED; // In wifi-echo.cpp
 
@@ -70,22 +72,26 @@ void EchoDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, int
     }
 }
 
+extern CHIPClusterServer server;
+/* This function can be eliminated, and instead its contents will get executed */
 void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
                                                       uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
                                                       uint8_t * value)
 {
-    if (clusterId != CHIP_ZCL_CLUSTER_ON_OFF)
+    /* TODO: For some reason, the first endpoint is 1 instead of 0 */
+    endpoint--;
+    printf("endpoint: %d, clusterId: %d, attrId: %d type: %d\n", endpoint, clusterId, attributeId, type);
+    for (int i = 0; i < kMaxClustersPerEndPoint; i++)
     {
-        ESP_LOGI(TAG, "Unknown cluster ID: %d", clusterId);
-        return;
-    }
-
-    if (attributeId != CHIP_ZCL_CLUSTER_ON_OFF_SERVER_ATTRIBUTE_ON_OFF)
-    {
-        ESP_LOGI(TAG, "Unknown attribute ID: %d", attributeId);
-        return;
+        if(server.mEndPoints[endpoint] &&
+           server.mEndPoints[endpoint]->mClusters[i] &&
+           server.mEndPoints[endpoint]->mClusters[i]->mClusterId == clusterId)
+        {
+            // At this point we can assume that value points to a boolean value.
+            CHIPValue cValue(kCHIPValueType_Bool);
+            memcpy((void *)&cValue.Int64, (void *)value, size);
+            printf("Value is %lld type is %d\n", cValue.Int64, type);
+            server.mEndPoints[endpoint]->mClusters[i]->Set(attributeId, cValue);
+        }
     }
-    ESP_LOGI(TAG, "Got the post attribute callback");
-    // At this point we can assume that value points to a boolean value.
-    statusLED.Set(*value);
 }
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 502a4b0a4f1899..2b0a8210625b9c 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -31,6 +31,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
+#include <lib/core/CHIPStandardAttributes.h>
 
 #if CONFIG_HAVE_DISPLAY
 // The Y position of the LED Status message on screen as a
@@ -46,7 +47,7 @@ static const char * onMsg  = "LIGHT: ON";
 static const char * offMsg = "LIGHT: OFF";
 
 #endif
-
+using namespace ::chip::DataModel;
 extern const char * TAG;
 
 void LEDWidget::Init(gpio_num_t gpioNum)
@@ -71,6 +72,19 @@ void LEDWidget::Set(bool state)
 {
     mBlinkOnTimeMS = mBlinkOffTimeMS = 0;
     DoSet(state);
+    CHIPBaseCluster::Set(kAttributeIdOnOff, CHIPValueBool(state));
+}
+
+int LEDWidget::Set(uint8_t attrId, const CHIPValue &value)
+{
+    if (attrId == kAttributeIdOnOff)
+    {
+        printf("Setting value to %d\n", CHIPValueToBool(value));
+        DoSet(CHIPValueToBool(value));
+        /* Update our internal data model as well */
+        CHIPBaseCluster::Set(attrId, value);
+    }
+    return SUCCESS;
 }
 
 void LEDWidget::Blink(uint32_t changeRateMS)
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index 9941845adfd61c..45ebefe7d93778 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -27,12 +27,14 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/timers.h"
+#include <lib/core/CHIPStandardClusters.h>
 
-class LEDWidget
+class LEDWidget : public chip::DataModel::CHIPClusterOnOff
 {
 public:
     void Init(gpio_num_t gpioNum);
     void Set(bool state);
+    int Set(uint8_t attrId, const chip::DataModel::CHIPValue &value);
     void Blink(uint32_t changeRateMS);
     void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
     void BlinkOnError();
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 7df77f38bd61bb..d67e78a59ca985 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -106,6 +106,14 @@ LEDWidget statusLED;
 const char * TAG = "wifi-echo-demo";
 
 static EchoDeviceCallbacks EchoCallbacks;
+const uint8_t ZCLVersion = 10;
+const uint8_t applicationVersion = 20;
+const uint8_t stackVersion = 1;
+const uint8_t HWVersion = 1;
+CHIPClusterServer server(ZCLVersion,
+                         applicationVersion,
+                         stackVersion,
+                         HWVersion);
 
 namespace {
 
@@ -434,16 +442,8 @@ extern "C" void app_main()
 
     statusLED.Init(STATUS_LED_GPIO_NUM);
 
-    uint8_t ZCLVersion = 10;
-    uint8_t applicationVersion = 20;
-    uint8_t stackVersion = 1;
-    uint8_t HWVersion = 1;
-    CHIPClusterServer server(ZCLVersion,
-                             applicationVersion,
-                             stackVersion,
-                             HWVersion);
     /* Add a cluster to the primary endpoint of our cluster server */
-    server.AddCluster(CHIPClusterOnOffNew());
+    server.AddCluster(&statusLED);
 
     // Start the Echo Server
     InitDataModelHandler();
diff --git a/src/lib/core/CHIPBaseAttribute.h b/src/lib/core/CHIPBaseAttribute.h
index 923a78e694d12c..34e8304f5278b3 100644
--- a/src/lib/core/CHIPBaseAttribute.h
+++ b/src/lib/core/CHIPBaseAttribute.h
@@ -62,7 +62,7 @@ class CHIPBaseAttribute
      *   with a Set() call on the base-ptr. In this case the argument
      *   will be CHIPValue.
      */
-    int Set(CHIPValue newValue)
+    int Set(const CHIPValue &newValue)
     {
         /* We have to check the element type match in this case */
         if (mValue.mType != newValue.mType)
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/core/CHIPBaseCluster.h
index 15d1e8ae4acf5c..6c97d9f0dc6a11 100644
--- a/src/lib/core/CHIPBaseCluster.h
+++ b/src/lib/core/CHIPBaseCluster.h
@@ -63,6 +63,30 @@ class CHIPBaseCluster
         }
         return FAIL;
     }
+
+    CHIPBaseAttribute *GetAttribute(uint8_t attrId)
+    {
+        for (int i = 0; i < kMaxAttributesPerCluster; i++)
+        {
+            if (mAttrs[i] &&
+                (mAttrs[i]->mAttrId == attrId))
+            {
+                return mAttrs[i];
+            }
+        }
+        return nullptr;
+    }
+
+    virtual int Set(uint8_t attrId, const CHIPValue &value)
+    {
+        /* Just hand-off to update the value internally */
+        auto attr = GetAttribute(attrId);
+        if (attr)
+        {
+            return attr->Set(value);
+        }
+        return FAIL;
+    }
 };
 
 
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/core/CHIPEndPoint.h
index 7fdad4ca8256d4..5ff30be630d8e0 100644
--- a/src/lib/core/CHIPEndPoint.h
+++ b/src/lib/core/CHIPEndPoint.h
@@ -75,6 +75,19 @@ class CHIPEndPoint
         }
         return FAIL;
     }
+
+    CHIPBaseCluster *GetCluster(uint8_t clusterId)
+    {
+        for (int i = 0; i < kMaxClustersPerEndPoint; i++)
+        {
+            if (mClusters[i] &&
+                mClusters[i]->mClusterId == clusterId)
+            {
+                return mClusters[i];
+            }
+        }
+        return nullptr;
+    }
 };
 
 
diff --git a/src/lib/core/CHIPStandardAttributes.h b/src/lib/core/CHIPStandardAttributes.h
index 93b97fa4f1541f..664cbd78b53d04 100644
--- a/src/lib/core/CHIPStandardAttributes.h
+++ b/src/lib/core/CHIPStandardAttributes.h
@@ -28,67 +28,28 @@
 
 namespace chip {
 namespace DataModel {
-#if 0
-template <typename AttrId, typename CHIPTypeName, typename TypeName>
-class CHIPSimpleAttribute : public CHIPBaseAttribute
-{
- public:
- CHIPSimpleAttribute() : CHIPBaseAttribute(AttrId, CHIPTypeName) {}
-
- int Set(const TypeName newValue)
- {
-     return CHIPBaseAttribute::Set(newValue);
- }
- bool Get()
- {
-     TypeName value;
-     CHIPBaseAttribute::Get(value);
-     return value;
- }
-};
-
-template <typename AttrId, typename CHIPTypeName, typename TypeName, typename MinRange, typename MaxRange>
-class CHIPRangeAttribute : public CHIPBaseAttribute
-{
- public:
- CHIPSimpleAttribute() : CHIPBaseAttribute(AttrId, CHIPTypeName, MinRange, MaxRange) {}
-
- int Set(const TypeName newValue)
- {
-     return CHIPBaseAttribute::Set(newValue);
- }
- bool Get()
- {
-     TypeName value;
-     CHIPBaseAttribute::Get(value);
-     return value;
- }
-};
-
-/* This will mostly be auto-generated */
-using CHIPAttributeOnOff = class CHIPSimpleAttribute<0x0000, kCHIPValueType_Bool, bool>;
-using CHIPAttributeGlobalSceneControl = class CHIPSimpleAttribute<0x4000, kCHIPValueType_Bool, bool>;
-using CHIPAttributeOnTime = class CHIPSimpleAttribute<0x4001, kCHIPValueType_UInt16, uint16_t>;
-using CHIPAttributeOffWaitTime = class CHIPSimpleAttribute<0x4002, kCHIPValueType_UInt16, uint16_t>;
-#endif
 
 /* TODO: It would be nice to use a pool allocator here once we have one */
 /* Base Cluster */
+static const uint16_t kAttributeIdZCLVersion = 0x0000;
 static inline CHIPBaseAttribute *CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
 {
-    return new CHIPBaseAttribute(0x0000, CHIPValueUInt8(ZCLVersion));
+    return new CHIPBaseAttribute(kAttributeIdZCLVersion, CHIPValueUInt8(ZCLVersion));
 }
 
+static const uint16_t kAttributeIdApplicationVersion = 0x0001;
 static inline CHIPBaseAttribute *CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
 {
-    return new CHIPBaseAttribute(0x0001, CHIPValueUInt8(applicationVersion));
+    return new CHIPBaseAttribute(kAttributeIdApplicationVersion, CHIPValueUInt8(applicationVersion));
 }
 
+static const uint16_t kAttributeIdStackVersion = 0x0002;
 static inline CHIPBaseAttribute *CHIPAttributeStackVersionNew(uint8_t stackVersion)
 {
-    return new CHIPBaseAttribute(0x0002, CHIPValueUInt8(stackVersion));
+    return new CHIPBaseAttribute(kAttributeIdStackVersion, CHIPValueUInt8(stackVersion));
 }
 
+static const uint16_t kAttributeIdHWVersion = 0x0003;
 static inline CHIPBaseAttribute *CHIPAttributeHWVersionNew(uint8_t HWVersion)
 {
     return new CHIPBaseAttribute(0x0003, CHIPValueUInt8(HWVersion));
@@ -96,21 +57,25 @@ static inline CHIPBaseAttribute *CHIPAttributeHWVersionNew(uint8_t HWVersion)
 
 
 /* On/Off Cluster */
+static const uint16_t kAttributeIdOnOff = 0x0000;
 static inline CHIPBaseAttribute *CHIPAttributeOnOffNew(void)
 {
-    return new CHIPBaseAttribute(0x0000, kCHIPValueType_Bool);
+    return new CHIPBaseAttribute(kAttributeIdOnOff, kCHIPValueType_Bool);
 }
 
+static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
 static inline CHIPBaseAttribute *CHIPAttributeGlobalSceneControlNew(void)
 {
-    return new CHIPBaseAttribute(0x4000, kCHIPValueType_Bool);
+    return new CHIPBaseAttribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
 }
 
+static const uint16_t kAttributeIdOnTime = 0x4001;
 static inline CHIPBaseAttribute *CHIPAttributeOnTimeNew(void)
 {
     return new CHIPBaseAttribute(0x4001, kCHIPValueType_UInt16);
 }
 
+static const uint16_t kAttributeIdOffWaitTime = 0x4002;
 static inline CHIPBaseAttribute *CHIPAttributeOffWaitTimeNew(void)
 {
     return new CHIPBaseAttribute(0x4002, kCHIPValueType_UInt16);
diff --git a/src/lib/core/CHIPStandardClusters.h b/src/lib/core/CHIPStandardClusters.h
index 3345e9cd8d2589..8a8b0b86f32273 100644
--- a/src/lib/core/CHIPStandardClusters.h
+++ b/src/lib/core/CHIPStandardClusters.h
@@ -30,30 +30,37 @@
 namespace chip {
 namespace DataModel {
 
-/* Base Cluster */
-    static inline CHIPBaseCluster *CHIPClusterBasicNew(uint8_t ZCLVersion,
-                                                       uint8_t applicationVersion,
-                                                       uint8_t stackVersion,
-                                                       uint8_t HWVersion)
+static const uint16_t kClusterIdBase = 0x0000;
+class CHIPClusterBasic : public CHIPBaseCluster
 {
-    CHIPBaseCluster *cluster = new CHIPBaseCluster(0x0000);
-    cluster->AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
-    cluster->AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
-    cluster->AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
-    cluster->AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
-    return cluster;
-}
-
-/* On/Off Cluster */
-static inline CHIPBaseCluster *CHIPClusterOnOffNew(void)
+public:
+    CHIPClusterBasic(uint8_t ZCLVersion,
+                     uint8_t applicationVersion,
+                     uint8_t stackVersion,
+                     uint8_t HWVersion) :
+        CHIPBaseCluster(kClusterIdBase)
+    {
+        AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
+        AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
+        AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
+        AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
+    }
+};
+
+static const uint16_t kClusterIdOnOff = 0x0006;
+class CHIPClusterOnOff : public CHIPBaseCluster
 {
-    CHIPBaseCluster *cluster = new CHIPBaseCluster(0x0006);
-    cluster->AddAttribute(CHIPAttributeOnOffNew());
-    cluster->AddAttribute(CHIPAttributeGlobalSceneControlNew());
-    cluster->AddAttribute(CHIPAttributeOnTimeNew());
-    cluster->AddAttribute(CHIPAttributeOffWaitTimeNew());
-    return cluster;
-}
+public:
+    CHIPClusterOnOff() :
+        CHIPBaseCluster(kClusterIdOnOff)
+    {
+        AddAttribute(CHIPAttributeOnOffNew());
+        AddAttribute(CHIPAttributeGlobalSceneControlNew());
+        AddAttribute(CHIPAttributeOnTimeNew());
+        AddAttribute(CHIPAttributeOffWaitTimeNew());
+    }
+};
+
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
index 4e23d4a594dfbd..24a893046f0cae 100644
--- a/src/lib/core/CHIPValues.h
+++ b/src/lib/core/CHIPValues.h
@@ -69,6 +69,7 @@ class CHIPValue
     union {
         uint64_t Int64;
     };
+    CHIPValue() {}
     CHIPValue(CHIPValueTypes type) : mType(type),Int64() {}
     CHIPValue(CHIPValueTypes type, uint64_t int64Value) : mType(type), Int64(int64Value) {}
 
@@ -97,8 +98,6 @@ class CHIPValue
         buf[0] = '\0';
         return;
     }
-private:
-    CHIPValue() {}
 
 };
 

From ed27179bbacfbd9048f5b931d23e32b7261f5fd1 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 7 Jul 2020 14:34:14 +0000
Subject: [PATCH 06/74] Restyled by clang-format

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp |  9 ++--
 .../wifi-echo/server/esp32/main/LEDWidget.cpp |  2 +-
 .../server/esp32/main/include/LEDWidget.h     |  2 +-
 .../wifi-echo/server/esp32/main/wifi-echo.cpp | 14 +++----
 src/lib/core/CHIPBaseAttribute.h              | 41 ++++++-------------
 src/lib/core/CHIPBaseCluster.h                | 14 +++----
 src/lib/core/CHIPClusterServer.h              | 13 ++----
 src/lib/core/CHIPEndPoint.cpp                 |  2 +-
 src/lib/core/CHIPEndPoint.h                   | 17 +++-----
 src/lib/core/CHIPStandardAttributes.h         | 17 ++++----
 src/lib/core/CHIPStandardClusters.h           |  9 +---
 src/lib/core/CHIPValues.h                     | 23 +++++------
 12 files changed, 61 insertions(+), 102 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index 24c546b7d7e53b..e7c609c2ceb45f 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -25,9 +25,9 @@
 
 #include "EchoDeviceCallbacks.h"
 #include "esp_log.h"
+#include <lib/core/CHIPClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
-#include <lib/core/CHIPClusterServer.h>
 
 #include "LEDWidget.h"
 #include <inet/IPAddress.h>
@@ -83,13 +83,12 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
     printf("endpoint: %d, clusterId: %d, attrId: %d type: %d\n", endpoint, clusterId, attributeId, type);
     for (int i = 0; i < kMaxClustersPerEndPoint; i++)
     {
-        if(server.mEndPoints[endpoint] &&
-           server.mEndPoints[endpoint]->mClusters[i] &&
-           server.mEndPoints[endpoint]->mClusters[i]->mClusterId == clusterId)
+        if (server.mEndPoints[endpoint] && server.mEndPoints[endpoint]->mClusters[i] &&
+            server.mEndPoints[endpoint]->mClusters[i]->mClusterId == clusterId)
         {
             // At this point we can assume that value points to a boolean value.
             CHIPValue cValue(kCHIPValueType_Bool);
-            memcpy((void *)&cValue.Int64, (void *)value, size);
+            memcpy((void *) &cValue.Int64, (void *) value, size);
             printf("Value is %lld type is %d\n", cValue.Int64, type);
             server.mEndPoints[endpoint]->mClusters[i]->Set(attributeId, cValue);
         }
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 2b0a8210625b9c..f72eb3d1e6fe2e 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -75,7 +75,7 @@ void LEDWidget::Set(bool state)
     CHIPBaseCluster::Set(kAttributeIdOnOff, CHIPValueBool(state));
 }
 
-int LEDWidget::Set(uint8_t attrId, const CHIPValue &value)
+int LEDWidget::Set(uint8_t attrId, const CHIPValue & value)
 {
     if (attrId == kAttributeIdOnOff)
     {
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index 45ebefe7d93778..fbe91510930d88 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -34,7 +34,7 @@ class LEDWidget : public chip::DataModel::CHIPClusterOnOff
 public:
     void Init(gpio_num_t gpioNum);
     void Set(bool state);
-    int Set(uint8_t attrId, const chip::DataModel::CHIPValue &value);
+    int Set(uint8_t attrId, const chip::DataModel::CHIPValue & value);
     void Blink(uint32_t changeRateMS);
     void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
     void BlinkOnError();
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index d67e78a59ca985..6563a8fbbc387b 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -42,11 +42,11 @@
 #include <vector>
 
 #include <crypto/CHIPCryptoPAL.h>
+#include <lib/core/CHIPClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/ErrorStr.h>
 #include <transport/SecureSessionMgr.h>
-#include <lib/core/CHIPClusterServer.h>
 
 using namespace ::chip;
 using namespace ::chip::DeviceLayer;
@@ -106,14 +106,11 @@ LEDWidget statusLED;
 const char * TAG = "wifi-echo-demo";
 
 static EchoDeviceCallbacks EchoCallbacks;
-const uint8_t ZCLVersion = 10;
+const uint8_t ZCLVersion         = 10;
 const uint8_t applicationVersion = 20;
-const uint8_t stackVersion = 1;
-const uint8_t HWVersion = 1;
-CHIPClusterServer server(ZCLVersion,
-                         applicationVersion,
-                         stackVersion,
-                         HWVersion);
+const uint8_t stackVersion       = 1;
+const uint8_t HWVersion          = 1;
+CHIPClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
 
 namespace {
 
@@ -397,7 +394,6 @@ void PrintDataModel(CHIPClusterServer & server)
     }
 }
 
-
 extern "C" void app_main()
 {
     ESP_LOGI(TAG, "WiFi Echo Demo!");
diff --git a/src/lib/core/CHIPBaseAttribute.h b/src/lib/core/CHIPBaseAttribute.h
index 34e8304f5278b3..87141eacaf9be9 100644
--- a/src/lib/core/CHIPBaseAttribute.h
+++ b/src/lib/core/CHIPBaseAttribute.h
@@ -29,27 +29,19 @@
 namespace chip {
 namespace DataModel {
 
-
 class CHIPBaseAttribute
 {
 public:
-    uint16_t         mAttrId;
-    CHIPValue        mValue;
-    CHIPValue        mMin;
-    CHIPValue        mMax;
+    uint16_t mAttrId;
+    CHIPValue mValue;
+    CHIPValue mMin;
+    CHIPValue mMax;
 
-    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId),
-        mValue(type),
-        mMin(type),
-        mMax(type) {}
-    CHIPBaseAttribute(uint16_t attrId, CHIPValue value) : mAttrId(attrId),
-        mValue(value),
-        mMin(value.mType),
-        mMax(value.mType) {}
-    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type, uint64_t min, uint64_t max) : mAttrId(attrId),
-        mValue(type),
-        mMin(type, min),
-        mMax(type, max) {}
+    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
+    CHIPBaseAttribute(uint16_t attrId, CHIPValue value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
+    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type, uint64_t min, uint64_t max) :
+        mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
+    {}
 
     /* An attribute is typically set in either of the following 2 ways:
      *
@@ -62,7 +54,7 @@ class CHIPBaseAttribute
      *   with a Set() call on the base-ptr. In this case the argument
      *   will be CHIPValue.
      */
-    int Set(const CHIPValue &newValue)
+    int Set(const CHIPValue & newValue)
     {
         /* We have to check the element type match in this case */
         if (mValue.mType != newValue.mType)
@@ -80,17 +72,10 @@ class CHIPBaseAttribute
     /* Need to define the behaviour when CHIPValue contains pointers
      * to allocated data
      */
-    CHIPValue Get()
-    {
-        return mValue;
-    }
+    CHIPValue Get() { return mValue; }
 
 protected:
-    bool withinRange(const uint64_t &value)
-    {
-        return (value >= mMin.Int64) &&
-            (value <= mMax.Int64);
-    }
+    bool withinRange(const uint64_t & value) { return (value >= mMin.Int64) && (value <= mMax.Int64); }
 
     bool withinRange(const CHIPValue value)
     {
@@ -113,10 +98,8 @@ class CHIPBaseAttribute
         }
         return false;
     }
-
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/core/CHIPBaseCluster.h
index 6c97d9f0dc6a11..2775a66ba9511e 100644
--- a/src/lib/core/CHIPBaseCluster.h
+++ b/src/lib/core/CHIPBaseCluster.h
@@ -34,8 +34,8 @@ static const uint8_t kMaxAttributesPerCluster = 10;
 class CHIPBaseCluster
 {
 public:
-    uint16_t           mClusterId;
-    CHIPBaseAttribute *mAttrs[kMaxAttributesPerCluster];
+    uint16_t mClusterId;
+    CHIPBaseAttribute * mAttrs[kMaxAttributesPerCluster];
 
     CHIPBaseCluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
 
@@ -51,7 +51,7 @@ class CHIPBaseCluster
         }
     }
 
-    int AddAttribute(CHIPBaseAttribute *attr)
+    int AddAttribute(CHIPBaseAttribute * attr)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -64,12 +64,11 @@ class CHIPBaseCluster
         return FAIL;
     }
 
-    CHIPBaseAttribute *GetAttribute(uint8_t attrId)
+    CHIPBaseAttribute * GetAttribute(uint8_t attrId)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
-            if (mAttrs[i] &&
-                (mAttrs[i]->mAttrId == attrId))
+            if (mAttrs[i] && (mAttrs[i]->mAttrId == attrId))
             {
                 return mAttrs[i];
             }
@@ -77,7 +76,7 @@ class CHIPBaseCluster
         return nullptr;
     }
 
-    virtual int Set(uint8_t attrId, const CHIPValue &value)
+    virtual int Set(uint8_t attrId, const CHIPValue & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
@@ -89,7 +88,6 @@ class CHIPBaseCluster
     }
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CHIPClusterServer.h b/src/lib/core/CHIPClusterServer.h
index 3dcc712ddb90e4..f783e20dd0cc0e 100644
--- a/src/lib/core/CHIPClusterServer.h
+++ b/src/lib/core/CHIPClusterServer.h
@@ -25,7 +25,6 @@
 #ifndef CHIPCLUSTERSERVER_H_
 #define CHIPCLUSTERSERVER_H_
 
-
 #include <lib/core/CHIPEndPoint.h>
 
 namespace chip {
@@ -36,12 +35,9 @@ static const uint8_t kMaxEndPointPerServer = 5;
 class CHIPClusterServer
 {
 public:
-    CHIPEndPoint *mEndPoints[kMaxEndPointPerServer];
+    CHIPEndPoint * mEndPoints[kMaxEndPointPerServer];
 
-    CHIPClusterServer(uint8_t ZCLVersion,
-                      uint8_t applicationVersion,
-                      uint8_t stackVersion,
-                      uint8_t HWVersion) : mEndPoints()
+    CHIPClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mEndPoints()
     {
         mEndPoints[0] = new CHIPEndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     }
@@ -59,7 +55,7 @@ class CHIPClusterServer
     }
 
     /* By default always add to the 0th endpoint, for simplicity */
-    int AddCluster(CHIPBaseCluster *cluster)
+    int AddCluster(CHIPBaseCluster * cluster)
     {
         if (!cluster)
         {
@@ -69,7 +65,7 @@ class CHIPClusterServer
         return mEndPoints[0]->AddCluster(cluster);
     }
 
-    int AddEndPoint(CHIPEndPoint *endPoint)
+    int AddEndPoint(CHIPEndPoint * endPoint)
     {
         for (int i = 0; i < kMaxEndPointPerServer; i++)
         {
@@ -83,7 +79,6 @@ class CHIPClusterServer
     }
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CHIPEndPoint.cpp b/src/lib/core/CHIPEndPoint.cpp
index b3f6103b6cb8ca..17945858ea1f06 100644
--- a/src/lib/core/CHIPEndPoint.cpp
+++ b/src/lib/core/CHIPEndPoint.cpp
@@ -26,7 +26,7 @@
 namespace chip {
 namespace DataModel {
 
-CHIPBaseCluster *CHIPEndPoint::mBasicCluster = nullptr;
+CHIPBaseCluster * CHIPEndPoint::mBasicCluster = nullptr;
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/core/CHIPEndPoint.h
index 5ff30be630d8e0..fe6cffd391a920 100644
--- a/src/lib/core/CHIPEndPoint.h
+++ b/src/lib/core/CHIPEndPoint.h
@@ -35,13 +35,10 @@ static const uint8_t kMaxClustersPerEndPoint = 5;
 class CHIPEndPoint
 {
 public:
-    static CHIPBaseCluster *mBasicCluster;
-    CHIPBaseCluster        *mClusters[kMaxClustersPerEndPoint];
+    static CHIPBaseCluster * mBasicCluster;
+    CHIPBaseCluster * mClusters[kMaxClustersPerEndPoint];
 
-    CHIPEndPoint(uint8_t ZCLVersion,
-                 uint8_t applicationVersion,
-                 uint8_t stackVersion,
-                 uint8_t HWVersion) : mClusters()
+    CHIPEndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
     {
         if (mBasicCluster == nullptr)
         {
@@ -63,7 +60,7 @@ class CHIPEndPoint
         }
     }
 
-    int AddCluster(CHIPBaseCluster *cluster)
+    int AddCluster(CHIPBaseCluster * cluster)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
@@ -76,12 +73,11 @@ class CHIPEndPoint
         return FAIL;
     }
 
-    CHIPBaseCluster *GetCluster(uint8_t clusterId)
+    CHIPBaseCluster * GetCluster(uint8_t clusterId)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
-            if (mClusters[i] &&
-                mClusters[i]->mClusterId == clusterId)
+            if (mClusters[i] && mClusters[i]->mClusterId == clusterId)
             {
                 return mClusters[i];
             }
@@ -90,7 +86,6 @@ class CHIPEndPoint
     }
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CHIPStandardAttributes.h b/src/lib/core/CHIPStandardAttributes.h
index 664cbd78b53d04..fb481336b8a184 100644
--- a/src/lib/core/CHIPStandardAttributes.h
+++ b/src/lib/core/CHIPStandardAttributes.h
@@ -32,51 +32,50 @@ namespace DataModel {
 /* TODO: It would be nice to use a pool allocator here once we have one */
 /* Base Cluster */
 static const uint16_t kAttributeIdZCLVersion = 0x0000;
-static inline CHIPBaseAttribute *CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
+static inline CHIPBaseAttribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
 {
     return new CHIPBaseAttribute(kAttributeIdZCLVersion, CHIPValueUInt8(ZCLVersion));
 }
 
 static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static inline CHIPBaseAttribute *CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
+static inline CHIPBaseAttribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
 {
     return new CHIPBaseAttribute(kAttributeIdApplicationVersion, CHIPValueUInt8(applicationVersion));
 }
 
 static const uint16_t kAttributeIdStackVersion = 0x0002;
-static inline CHIPBaseAttribute *CHIPAttributeStackVersionNew(uint8_t stackVersion)
+static inline CHIPBaseAttribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
 {
     return new CHIPBaseAttribute(kAttributeIdStackVersion, CHIPValueUInt8(stackVersion));
 }
 
 static const uint16_t kAttributeIdHWVersion = 0x0003;
-static inline CHIPBaseAttribute *CHIPAttributeHWVersionNew(uint8_t HWVersion)
+static inline CHIPBaseAttribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
 {
     return new CHIPBaseAttribute(0x0003, CHIPValueUInt8(HWVersion));
 }
 
-
 /* On/Off Cluster */
 static const uint16_t kAttributeIdOnOff = 0x0000;
-static inline CHIPBaseAttribute *CHIPAttributeOnOffNew(void)
+static inline CHIPBaseAttribute * CHIPAttributeOnOffNew(void)
 {
     return new CHIPBaseAttribute(kAttributeIdOnOff, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
-static inline CHIPBaseAttribute *CHIPAttributeGlobalSceneControlNew(void)
+static inline CHIPBaseAttribute * CHIPAttributeGlobalSceneControlNew(void)
 {
     return new CHIPBaseAttribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdOnTime = 0x4001;
-static inline CHIPBaseAttribute *CHIPAttributeOnTimeNew(void)
+static inline CHIPBaseAttribute * CHIPAttributeOnTimeNew(void)
 {
     return new CHIPBaseAttribute(0x4001, kCHIPValueType_UInt16);
 }
 
 static const uint16_t kAttributeIdOffWaitTime = 0x4002;
-static inline CHIPBaseAttribute *CHIPAttributeOffWaitTimeNew(void)
+static inline CHIPBaseAttribute * CHIPAttributeOffWaitTimeNew(void)
 {
     return new CHIPBaseAttribute(0x4002, kCHIPValueType_UInt16);
 }
diff --git a/src/lib/core/CHIPStandardClusters.h b/src/lib/core/CHIPStandardClusters.h
index 8a8b0b86f32273..01aa359592e2aa 100644
--- a/src/lib/core/CHIPStandardClusters.h
+++ b/src/lib/core/CHIPStandardClusters.h
@@ -34,10 +34,7 @@ static const uint16_t kClusterIdBase = 0x0000;
 class CHIPClusterBasic : public CHIPBaseCluster
 {
 public:
-    CHIPClusterBasic(uint8_t ZCLVersion,
-                     uint8_t applicationVersion,
-                     uint8_t stackVersion,
-                     uint8_t HWVersion) :
+    CHIPClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
         CHIPBaseCluster(kClusterIdBase)
     {
         AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
@@ -51,8 +48,7 @@ static const uint16_t kClusterIdOnOff = 0x0006;
 class CHIPClusterOnOff : public CHIPBaseCluster
 {
 public:
-    CHIPClusterOnOff() :
-        CHIPBaseCluster(kClusterIdOnOff)
+    CHIPClusterOnOff() : CHIPBaseCluster(kClusterIdOnOff)
     {
         AddAttribute(CHIPAttributeOnOffNew());
         AddAttribute(CHIPAttributeGlobalSceneControlNew());
@@ -61,7 +57,6 @@ class CHIPClusterOnOff : public CHIPBaseCluster
     }
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
index 24a893046f0cae..a96554283bea21 100644
--- a/src/lib/core/CHIPValues.h
+++ b/src/lib/core/CHIPValues.h
@@ -25,8 +25,8 @@
 #define CHIPVALUES_H_
 
 #include <inttypes.h>
-#include <stdint.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 
 namespace chip {
@@ -34,11 +34,11 @@ namespace DataModel {
 
 /* XXX Remove later*/
 #define SUCCESS 0
-#define FAIL    -1
+#define FAIL -1
 
 enum CHIPValueTypes
 {
-    kCHIPValueType_NotSpecified           = -1,
+    kCHIPValueType_NotSpecified = -1,
     kCHIPValueType_Int8,
     kCHIPValueType_Int16,
     kCHIPValueType_Int32,
@@ -66,14 +66,15 @@ class CHIPValue
 {
 public:
     CHIPValueTypes mType;
-    union {
+    union
+    {
         uint64_t Int64;
     };
     CHIPValue() {}
-    CHIPValue(CHIPValueTypes type) : mType(type),Int64() {}
+    CHIPValue(CHIPValueTypes type) : mType(type), Int64() {}
     CHIPValue(CHIPValueTypes type, uint64_t int64Value) : mType(type), Int64(int64Value) {}
 
-    void ValueToStr(char *buf, int maxlen)
+    void ValueToStr(char * buf, int maxlen)
     {
         switch (mType)
         {
@@ -98,28 +99,26 @@ class CHIPValue
         buf[0] = '\0';
         return;
     }
-
 };
 
-
 static inline CHIPValue CHIPValueBool(bool b)
 {
-    return CHIPValue(kCHIPValueType_Bool, (uint64_t)b);
+    return CHIPValue(kCHIPValueType_Bool, (uint64_t) b);
 }
 
 static inline bool CHIPValueToBool(CHIPValue v)
 {
-    return (bool)v.Int64;
+    return (bool) v.Int64;
 }
 
 static inline CHIPValue CHIPValueUInt8(uint8_t b)
 {
-    return CHIPValue(kCHIPValueType_UInt8, (uint64_t)b);
+    return CHIPValue(kCHIPValueType_UInt8, (uint64_t) b);
 }
 
 static inline uint8_t CHIPValueToUInt8(CHIPValue v)
 {
-    return (uint8_t)v.Int64;
+    return (uint8_t) v.Int64;
 }
 
 } // namespace DataModel

From dc2f1d958033ef0f177b28d1afeb52f044b46c59 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 7 Jul 2020 20:16:58 +0530
Subject: [PATCH 07/74] Fix incorrect data type

---
 examples/wifi-echo/server/esp32/main/LEDWidget.cpp       | 2 +-
 examples/wifi-echo/server/esp32/main/include/LEDWidget.h | 2 +-
 src/lib/core/CHIPBaseCluster.h                           | 4 ++--
 src/lib/core/CHIPEndPoint.h                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index f72eb3d1e6fe2e..7eb981651b9e32 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -75,7 +75,7 @@ void LEDWidget::Set(bool state)
     CHIPBaseCluster::Set(kAttributeIdOnOff, CHIPValueBool(state));
 }
 
-int LEDWidget::Set(uint8_t attrId, const CHIPValue & value)
+int LEDWidget::Set(uint16_t attrId, const CHIPValue & value)
 {
     if (attrId == kAttributeIdOnOff)
     {
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index fbe91510930d88..4ebd25d84c7b70 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -34,7 +34,7 @@ class LEDWidget : public chip::DataModel::CHIPClusterOnOff
 public:
     void Init(gpio_num_t gpioNum);
     void Set(bool state);
-    int Set(uint8_t attrId, const chip::DataModel::CHIPValue & value);
+    int Set(uint16_t attrId, const chip::DataModel::CHIPValue & value);
     void Blink(uint32_t changeRateMS);
     void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
     void BlinkOnError();
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/core/CHIPBaseCluster.h
index 2775a66ba9511e..9b34b7f2a66928 100644
--- a/src/lib/core/CHIPBaseCluster.h
+++ b/src/lib/core/CHIPBaseCluster.h
@@ -64,7 +64,7 @@ class CHIPBaseCluster
         return FAIL;
     }
 
-    CHIPBaseAttribute * GetAttribute(uint8_t attrId)
+    CHIPBaseAttribute * GetAttribute(uint16_t attrId)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -76,7 +76,7 @@ class CHIPBaseCluster
         return nullptr;
     }
 
-    virtual int Set(uint8_t attrId, const CHIPValue & value)
+    virtual int Set(uint16_t attrId, const CHIPValue & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/core/CHIPEndPoint.h
index fe6cffd391a920..0cfaf3327649d3 100644
--- a/src/lib/core/CHIPEndPoint.h
+++ b/src/lib/core/CHIPEndPoint.h
@@ -42,7 +42,7 @@ class CHIPEndPoint
     {
         if (mBasicCluster == nullptr)
         {
-            mBasicCluster = CHIPClusterBasicNew(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+            mBasicCluster = new CHIPClusterBasic(ZCLVersion, applicationVersion, stackVersion, HWVersion);
             /* TODO: allocation failure? */
         }
         mClusters[0] = mBasicCluster;

From 1e4612c39b6e063c1f8032768be20586671e83d0 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 8 Jul 2020 16:51:09 +0530
Subject: [PATCH 08/74] Endpoint 0 is reserved

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp       |  2 --
 src/lib/core/CHIPClusterServer.h                    | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index e7c609c2ceb45f..ede800c4e81216 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -78,8 +78,6 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
                                                       uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
                                                       uint8_t * value)
 {
-    /* TODO: For some reason, the first endpoint is 1 instead of 0 */
-    endpoint--;
     printf("endpoint: %d, clusterId: %d, attrId: %d type: %d\n", endpoint, clusterId, attributeId, type);
     for (int i = 0; i < kMaxClustersPerEndPoint; i++)
     {
diff --git a/src/lib/core/CHIPClusterServer.h b/src/lib/core/CHIPClusterServer.h
index f783e20dd0cc0e..0de8650119c110 100644
--- a/src/lib/core/CHIPClusterServer.h
+++ b/src/lib/core/CHIPClusterServer.h
@@ -32,6 +32,9 @@ namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxEndPointPerServer = 5;
+/* TODO: If endpoint numbers range up to 256, it may be better not to use array index as the endpoint id */
+/* Skip the reserved endPointId */
+static const uint8_t kEndPointIdStart = 1;
 class CHIPClusterServer
 {
 public:
@@ -39,12 +42,12 @@ class CHIPClusterServer
 
     CHIPClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mEndPoints()
     {
-        mEndPoints[0] = new CHIPEndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+        mEndPoints[kEndPointIdStart] = new CHIPEndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     }
 
     virtual ~CHIPClusterServer()
     {
-        for (int i = 1; i < kMaxEndPointPerServer; i++)
+        for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
         {
             if (mEndPoints[i] != nullptr)
             {
@@ -54,7 +57,7 @@ class CHIPClusterServer
         }
     }
 
-    /* By default always add to the 0th endpoint, for simplicity */
+    /* By default always add to the kEndPointIdStartth endpoint, for simplicity */
     int AddCluster(CHIPBaseCluster * cluster)
     {
         if (!cluster)
@@ -62,12 +65,12 @@ class CHIPClusterServer
             return FAIL;
         }
 
-        return mEndPoints[0]->AddCluster(cluster);
+        return mEndPoints[kEndPointIdStart]->AddCluster(cluster);
     }
 
     int AddEndPoint(CHIPEndPoint * endPoint)
     {
-        for (int i = 0; i < kMaxEndPointPerServer; i++)
+        for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
         {
             if (mEndPoints[i] == nullptr)
             {

From 2a33054c64e51907cbf2449cf3fbdaf18271bfa5 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 8 Jul 2020 17:17:40 +0530
Subject: [PATCH 09/74] Eliminate CHIP prefix from the datatype/function names

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp |  4 +--
 .../wifi-echo/server/esp32/main/LEDWidget.cpp | 10 +++---
 .../server/esp32/main/include/LEDWidget.h     |  4 +--
 .../wifi-echo/server/esp32/main/wifi-echo.cpp |  4 +--
 src/lib/core/CHIPBaseAttribute.h              | 24 +++++++-------
 src/lib/core/CHIPBaseCluster.h                | 14 ++++----
 src/lib/core/CHIPClusterServer.h              | 14 ++++----
 src/lib/core/CHIPEndPoint.cpp                 |  4 +--
 src/lib/core/CHIPEndPoint.h                   | 16 +++++-----
 src/lib/core/CHIPStandardAttributes.h         | 32 +++++++++----------
 src/lib/core/CHIPStandardClusters.h           | 10 +++---
 src/lib/core/CHIPValues.h                     | 24 +++++++-------
 12 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index ede800c4e81216..d46cbc0715d5b5 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -72,7 +72,7 @@ void EchoDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, int
     }
 }
 
-extern CHIPClusterServer server;
+extern ClusterServer server;
 /* This function can be eliminated, and instead its contents will get executed */
 void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
                                                       uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
@@ -85,7 +85,7 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
             server.mEndPoints[endpoint]->mClusters[i]->mClusterId == clusterId)
         {
             // At this point we can assume that value points to a boolean value.
-            CHIPValue cValue(kCHIPValueType_Bool);
+            Value cValue(kCHIPValueType_Bool);
             memcpy((void *) &cValue.Int64, (void *) value, size);
             printf("Value is %lld type is %d\n", cValue.Int64, type);
             server.mEndPoints[endpoint]->mClusters[i]->Set(attributeId, cValue);
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 7eb981651b9e32..f8da01087c8e33 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -72,17 +72,17 @@ void LEDWidget::Set(bool state)
 {
     mBlinkOnTimeMS = mBlinkOffTimeMS = 0;
     DoSet(state);
-    CHIPBaseCluster::Set(kAttributeIdOnOff, CHIPValueBool(state));
+    BaseCluster::Set(kAttributeIdOnOff, ValueBool(state));
 }
 
-int LEDWidget::Set(uint16_t attrId, const CHIPValue & value)
+int LEDWidget::Set(uint16_t attrId, const Value & value)
 {
     if (attrId == kAttributeIdOnOff)
     {
-        printf("Setting value to %d\n", CHIPValueToBool(value));
-        DoSet(CHIPValueToBool(value));
+        printf("Setting value to %d\n", ValueToBool(value));
+        DoSet(ValueToBool(value));
         /* Update our internal data model as well */
-        CHIPBaseCluster::Set(attrId, value);
+        BaseCluster::Set(attrId, value);
     }
     return SUCCESS;
 }
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index 4ebd25d84c7b70..d8bdbcf994cfe7 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -29,12 +29,12 @@
 #include "freertos/timers.h"
 #include <lib/core/CHIPStandardClusters.h>
 
-class LEDWidget : public chip::DataModel::CHIPClusterOnOff
+class LEDWidget : public chip::DataModel::ClusterOnOff
 {
 public:
     void Init(gpio_num_t gpioNum);
     void Set(bool state);
-    int Set(uint16_t attrId, const chip::DataModel::CHIPValue & value);
+    int Set(uint16_t attrId, const chip::DataModel::Value & value);
     void Blink(uint32_t changeRateMS);
     void Blink(uint32_t onTimeMS, uint32_t offTimeMS);
     void BlinkOnError();
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 6563a8fbbc387b..9c52bf3bbcdbc2 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -110,7 +110,7 @@ const uint8_t ZCLVersion         = 10;
 const uint8_t applicationVersion = 20;
 const uint8_t stackVersion       = 1;
 const uint8_t HWVersion          = 1;
-CHIPClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
 
 namespace {
 
@@ -359,7 +359,7 @@ std::string createSetupPayload()
 
 } // namespace
 
-void PrintDataModel(CHIPClusterServer & server)
+void PrintDataModel(ClusterServer & server)
 {
     printf("Server:\n");
     for (int i = 0; i < kMaxEndPointPerServer; i++)
diff --git a/src/lib/core/CHIPBaseAttribute.h b/src/lib/core/CHIPBaseAttribute.h
index 87141eacaf9be9..17bd985757aaae 100644
--- a/src/lib/core/CHIPBaseAttribute.h
+++ b/src/lib/core/CHIPBaseAttribute.h
@@ -29,17 +29,17 @@
 namespace chip {
 namespace DataModel {
 
-class CHIPBaseAttribute
+class BaseAttribute
 {
 public:
     uint16_t mAttrId;
-    CHIPValue mValue;
-    CHIPValue mMin;
-    CHIPValue mMax;
+    Value mValue;
+    Value mMin;
+    Value mMax;
 
-    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
-    CHIPBaseAttribute(uint16_t attrId, CHIPValue value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
-    CHIPBaseAttribute(uint16_t attrId, CHIPValueTypes type, uint64_t min, uint64_t max) :
+    BaseAttribute(uint16_t attrId, ValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
+    BaseAttribute(uint16_t attrId, Value value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
+    BaseAttribute(uint16_t attrId, ValueTypes type, uint64_t min, uint64_t max) :
         mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
     {}
 
@@ -52,9 +52,9 @@ class CHIPBaseAttribute
      * - From the bottom of the stack when the stack receives a schema
      *   with just a list of values. This will typically get called
      *   with a Set() call on the base-ptr. In this case the argument
-     *   will be CHIPValue.
+     *   will be Value.
      */
-    int Set(const CHIPValue & newValue)
+    int Set(const Value & newValue)
     {
         /* We have to check the element type match in this case */
         if (mValue.mType != newValue.mType)
@@ -69,15 +69,15 @@ class CHIPBaseAttribute
         return FAIL;
     }
 
-    /* Need to define the behaviour when CHIPValue contains pointers
+    /* Need to define the behaviour when Value contains pointers
      * to allocated data
      */
-    CHIPValue Get() { return mValue; }
+    Value Get() { return mValue; }
 
 protected:
     bool withinRange(const uint64_t & value) { return (value >= mMin.Int64) && (value <= mMax.Int64); }
 
-    bool withinRange(const CHIPValue value)
+    bool withinRange(const Value value)
     {
         switch (mValue.mType)
         {
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/core/CHIPBaseCluster.h
index 9b34b7f2a66928..b71b2835fef99b 100644
--- a/src/lib/core/CHIPBaseCluster.h
+++ b/src/lib/core/CHIPBaseCluster.h
@@ -31,15 +31,15 @@ namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxAttributesPerCluster = 10;
-class CHIPBaseCluster
+class BaseCluster
 {
 public:
     uint16_t mClusterId;
-    CHIPBaseAttribute * mAttrs[kMaxAttributesPerCluster];
+    BaseAttribute * mAttrs[kMaxAttributesPerCluster];
 
-    CHIPBaseCluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
+    BaseCluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
 
-    virtual ~CHIPBaseCluster()
+    virtual ~BaseCluster()
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -51,7 +51,7 @@ class CHIPBaseCluster
         }
     }
 
-    int AddAttribute(CHIPBaseAttribute * attr)
+    int AddAttribute(BaseAttribute * attr)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -64,7 +64,7 @@ class CHIPBaseCluster
         return FAIL;
     }
 
-    CHIPBaseAttribute * GetAttribute(uint16_t attrId)
+    BaseAttribute * GetAttribute(uint16_t attrId)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -76,7 +76,7 @@ class CHIPBaseCluster
         return nullptr;
     }
 
-    virtual int Set(uint16_t attrId, const CHIPValue & value)
+    virtual int Set(uint16_t attrId, const Value & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
diff --git a/src/lib/core/CHIPClusterServer.h b/src/lib/core/CHIPClusterServer.h
index 0de8650119c110..d7bc859d3f7df1 100644
--- a/src/lib/core/CHIPClusterServer.h
+++ b/src/lib/core/CHIPClusterServer.h
@@ -35,17 +35,17 @@ static const uint8_t kMaxEndPointPerServer = 5;
 /* TODO: If endpoint numbers range up to 256, it may be better not to use array index as the endpoint id */
 /* Skip the reserved endPointId */
 static const uint8_t kEndPointIdStart = 1;
-class CHIPClusterServer
+class ClusterServer
 {
 public:
-    CHIPEndPoint * mEndPoints[kMaxEndPointPerServer];
+    EndPoint * mEndPoints[kMaxEndPointPerServer];
 
-    CHIPClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mEndPoints()
+    ClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mEndPoints()
     {
-        mEndPoints[kEndPointIdStart] = new CHIPEndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+        mEndPoints[kEndPointIdStart] = new EndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     }
 
-    virtual ~CHIPClusterServer()
+    virtual ~ClusterServer()
     {
         for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
         {
@@ -58,7 +58,7 @@ class CHIPClusterServer
     }
 
     /* By default always add to the kEndPointIdStartth endpoint, for simplicity */
-    int AddCluster(CHIPBaseCluster * cluster)
+    int AddCluster(BaseCluster * cluster)
     {
         if (!cluster)
         {
@@ -68,7 +68,7 @@ class CHIPClusterServer
         return mEndPoints[kEndPointIdStart]->AddCluster(cluster);
     }
 
-    int AddEndPoint(CHIPEndPoint * endPoint)
+    int AddEndPoint(EndPoint * endPoint)
     {
         for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
         {
diff --git a/src/lib/core/CHIPEndPoint.cpp b/src/lib/core/CHIPEndPoint.cpp
index 17945858ea1f06..1cde502794401e 100644
--- a/src/lib/core/CHIPEndPoint.cpp
+++ b/src/lib/core/CHIPEndPoint.cpp
@@ -17,7 +17,7 @@
 
 /**
  *    @file
- *      This file implements the CHIPEndPoint class
+ *      This file implements the EndPoint class
  *
  */
 
@@ -26,7 +26,7 @@
 namespace chip {
 namespace DataModel {
 
-CHIPBaseCluster * CHIPEndPoint::mBasicCluster = nullptr;
+BaseCluster * EndPoint::mBasicCluster = nullptr;
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/core/CHIPEndPoint.h
index 0cfaf3327649d3..8ac5b9e1af7aa6 100644
--- a/src/lib/core/CHIPEndPoint.h
+++ b/src/lib/core/CHIPEndPoint.h
@@ -32,23 +32,23 @@ namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxClustersPerEndPoint = 5;
-class CHIPEndPoint
+class EndPoint
 {
 public:
-    static CHIPBaseCluster * mBasicCluster;
-    CHIPBaseCluster * mClusters[kMaxClustersPerEndPoint];
+    static BaseCluster * mBasicCluster;
+    BaseCluster * mClusters[kMaxClustersPerEndPoint];
 
-    CHIPEndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
+    EndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
     {
         if (mBasicCluster == nullptr)
         {
-            mBasicCluster = new CHIPClusterBasic(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+            mBasicCluster = new ClusterBasic(ZCLVersion, applicationVersion, stackVersion, HWVersion);
             /* TODO: allocation failure? */
         }
         mClusters[0] = mBasicCluster;
     }
 
-    virtual ~CHIPEndPoint()
+    virtual ~EndPoint()
     {
         for (int i = 1; i < kMaxClustersPerEndPoint; i++)
         {
@@ -60,7 +60,7 @@ class CHIPEndPoint
         }
     }
 
-    int AddCluster(CHIPBaseCluster * cluster)
+    int AddCluster(BaseCluster * cluster)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
@@ -73,7 +73,7 @@ class CHIPEndPoint
         return FAIL;
     }
 
-    CHIPBaseCluster * GetCluster(uint8_t clusterId)
+    BaseCluster * GetCluster(uint8_t clusterId)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
diff --git a/src/lib/core/CHIPStandardAttributes.h b/src/lib/core/CHIPStandardAttributes.h
index fb481336b8a184..114e47b337133a 100644
--- a/src/lib/core/CHIPStandardAttributes.h
+++ b/src/lib/core/CHIPStandardAttributes.h
@@ -32,52 +32,52 @@ namespace DataModel {
 /* TODO: It would be nice to use a pool allocator here once we have one */
 /* Base Cluster */
 static const uint16_t kAttributeIdZCLVersion = 0x0000;
-static inline CHIPBaseAttribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
+static inline BaseAttribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
 {
-    return new CHIPBaseAttribute(kAttributeIdZCLVersion, CHIPValueUInt8(ZCLVersion));
+    return new BaseAttribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
 }
 
 static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static inline CHIPBaseAttribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
+static inline BaseAttribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
 {
-    return new CHIPBaseAttribute(kAttributeIdApplicationVersion, CHIPValueUInt8(applicationVersion));
+    return new BaseAttribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
 }
 
 static const uint16_t kAttributeIdStackVersion = 0x0002;
-static inline CHIPBaseAttribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
+static inline BaseAttribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
 {
-    return new CHIPBaseAttribute(kAttributeIdStackVersion, CHIPValueUInt8(stackVersion));
+    return new BaseAttribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
 }
 
 static const uint16_t kAttributeIdHWVersion = 0x0003;
-static inline CHIPBaseAttribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
+static inline BaseAttribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
 {
-    return new CHIPBaseAttribute(0x0003, CHIPValueUInt8(HWVersion));
+    return new BaseAttribute(0x0003, ValueUInt8(HWVersion));
 }
 
 /* On/Off Cluster */
 static const uint16_t kAttributeIdOnOff = 0x0000;
-static inline CHIPBaseAttribute * CHIPAttributeOnOffNew(void)
+static inline BaseAttribute * CHIPAttributeOnOffNew(void)
 {
-    return new CHIPBaseAttribute(kAttributeIdOnOff, kCHIPValueType_Bool);
+    return new BaseAttribute(kAttributeIdOnOff, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
-static inline CHIPBaseAttribute * CHIPAttributeGlobalSceneControlNew(void)
+static inline BaseAttribute * CHIPAttributeGlobalSceneControlNew(void)
 {
-    return new CHIPBaseAttribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
+    return new BaseAttribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdOnTime = 0x4001;
-static inline CHIPBaseAttribute * CHIPAttributeOnTimeNew(void)
+static inline BaseAttribute * CHIPAttributeOnTimeNew(void)
 {
-    return new CHIPBaseAttribute(0x4001, kCHIPValueType_UInt16);
+    return new BaseAttribute(0x4001, kCHIPValueType_UInt16);
 }
 
 static const uint16_t kAttributeIdOffWaitTime = 0x4002;
-static inline CHIPBaseAttribute * CHIPAttributeOffWaitTimeNew(void)
+static inline BaseAttribute * CHIPAttributeOffWaitTimeNew(void)
 {
-    return new CHIPBaseAttribute(0x4002, kCHIPValueType_UInt16);
+    return new BaseAttribute(0x4002, kCHIPValueType_UInt16);
 }
 
 } // namespace DataModel
diff --git a/src/lib/core/CHIPStandardClusters.h b/src/lib/core/CHIPStandardClusters.h
index 01aa359592e2aa..9c547df335cc0b 100644
--- a/src/lib/core/CHIPStandardClusters.h
+++ b/src/lib/core/CHIPStandardClusters.h
@@ -31,11 +31,11 @@ namespace chip {
 namespace DataModel {
 
 static const uint16_t kClusterIdBase = 0x0000;
-class CHIPClusterBasic : public CHIPBaseCluster
+class ClusterBasic : public BaseCluster
 {
 public:
-    CHIPClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
-        CHIPBaseCluster(kClusterIdBase)
+    ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
+        BaseCluster(kClusterIdBase)
     {
         AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
         AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
@@ -45,10 +45,10 @@ class CHIPClusterBasic : public CHIPBaseCluster
 };
 
 static const uint16_t kClusterIdOnOff = 0x0006;
-class CHIPClusterOnOff : public CHIPBaseCluster
+class ClusterOnOff : public BaseCluster
 {
 public:
-    CHIPClusterOnOff() : CHIPBaseCluster(kClusterIdOnOff)
+    ClusterOnOff() : BaseCluster(kClusterIdOnOff)
     {
         AddAttribute(CHIPAttributeOnOffNew());
         AddAttribute(CHIPAttributeGlobalSceneControlNew());
diff --git a/src/lib/core/CHIPValues.h b/src/lib/core/CHIPValues.h
index a96554283bea21..6980a640e933a5 100644
--- a/src/lib/core/CHIPValues.h
+++ b/src/lib/core/CHIPValues.h
@@ -36,7 +36,7 @@ namespace DataModel {
 #define SUCCESS 0
 #define FAIL -1
 
-enum CHIPValueTypes
+enum ValueTypes
 {
     kCHIPValueType_NotSpecified = -1,
     kCHIPValueType_Int8,
@@ -62,17 +62,17 @@ enum CHIPValueTypes
     kCHIPValueType_EndOfContainer,
 };
 
-class CHIPValue
+class Value
 {
 public:
-    CHIPValueTypes mType;
+    ValueTypes mType;
     union
     {
         uint64_t Int64;
     };
-    CHIPValue() {}
-    CHIPValue(CHIPValueTypes type) : mType(type), Int64() {}
-    CHIPValue(CHIPValueTypes type, uint64_t int64Value) : mType(type), Int64(int64Value) {}
+    Value() {}
+    Value(ValueTypes type) : mType(type), Int64() {}
+    Value(ValueTypes type, uint64_t int64Value) : mType(type), Int64(int64Value) {}
 
     void ValueToStr(char * buf, int maxlen)
     {
@@ -101,22 +101,22 @@ class CHIPValue
     }
 };
 
-static inline CHIPValue CHIPValueBool(bool b)
+static inline Value ValueBool(bool b)
 {
-    return CHIPValue(kCHIPValueType_Bool, (uint64_t) b);
+    return Value(kCHIPValueType_Bool, (uint64_t) b);
 }
 
-static inline bool CHIPValueToBool(CHIPValue v)
+static inline bool ValueToBool(Value v)
 {
     return (bool) v.Int64;
 }
 
-static inline CHIPValue CHIPValueUInt8(uint8_t b)
+static inline Value ValueUInt8(uint8_t b)
 {
-    return CHIPValue(kCHIPValueType_UInt8, (uint64_t) b);
+    return Value(kCHIPValueType_UInt8, (uint64_t) b);
 }
 
-static inline uint8_t CHIPValueToUInt8(CHIPValue v)
+static inline uint8_t ValueToUInt8(Value v)
 {
     return (uint8_t) v.Int64;
 }

From 71f575f14c4338927b8d1c81b256ca7c5d562d05 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 8 Jul 2020 17:45:22 +0530
Subject: [PATCH 10/74] Move to lib/datamodel from lib/core

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp |  2 +-
 .../wifi-echo/server/esp32/main/LEDWidget.cpp |  2 +-
 .../server/esp32/main/include/LEDWidget.h     |  2 +-
 .../wifi-echo/server/esp32/main/wifi-echo.cpp |  2 +-
 src/lib/Makefile.am                           |  5 +++
 src/lib/core/CoreLayer.am                     |  8 ----
 .../{core => datamodel}/CHIPBaseAttribute.h   |  2 +-
 src/lib/{core => datamodel}/CHIPBaseCluster.h |  2 +-
 .../{core => datamodel}/CHIPClusterServer.h   |  2 +-
 src/lib/{core => datamodel}/CHIPEndPoint.cpp  |  2 +-
 src/lib/{core => datamodel}/CHIPEndPoint.h    |  4 +-
 .../CHIPStandardAttributes.h                  |  2 +-
 .../CHIPStandardClusters.h                    |  4 +-
 src/lib/{core => datamodel}/CHIPValues.h      |  0
 src/lib/datamodel/DataModel.am                | 38 +++++++++++++++++++
 15 files changed, 56 insertions(+), 21 deletions(-)
 rename src/lib/{core => datamodel}/CHIPBaseAttribute.h (98%)
 rename src/lib/{core => datamodel}/CHIPBaseCluster.h (98%)
 rename src/lib/{core => datamodel}/CHIPClusterServer.h (98%)
 rename src/lib/{core => datamodel}/CHIPEndPoint.cpp (95%)
 rename src/lib/{core => datamodel}/CHIPEndPoint.h (96%)
 rename src/lib/{core => datamodel}/CHIPStandardAttributes.h (98%)
 rename src/lib/{core => datamodel}/CHIPStandardClusters.h (95%)
 rename src/lib/{core => datamodel}/CHIPValues.h (100%)
 create mode 100644 src/lib/datamodel/DataModel.am

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index d46cbc0715d5b5..a2dc92b472cd44 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -25,7 +25,7 @@
 
 #include "EchoDeviceCallbacks.h"
 #include "esp_log.h"
-#include <lib/core/CHIPClusterServer.h>
+#include <lib/datamodel/CHIPClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index f8da01087c8e33..0ea3e20316a0bc 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -31,7 +31,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
-#include <lib/core/CHIPStandardAttributes.h>
+#include <lib/datamodel/CHIPStandardAttributes.h>
 
 #if CONFIG_HAVE_DISPLAY
 // The Y position of the LED Status message on screen as a
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index d8bdbcf994cfe7..3f450b25c49a4e 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -27,7 +27,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/timers.h"
-#include <lib/core/CHIPStandardClusters.h>
+#include <lib/datamodel/CHIPStandardClusters.h>
 
 class LEDWidget : public chip::DataModel::ClusterOnOff
 {
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 9c52bf3bbcdbc2..d00dbe3e0d14ee 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -42,7 +42,7 @@
 #include <vector>
 
 #include <crypto/CHIPCryptoPAL.h>
-#include <lib/core/CHIPClusterServer.h>
+#include <lib/datamodel/CHIPClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/ErrorStr.h>
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index eed6946b89f5f1..f396e097f7766f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -37,6 +37,7 @@ include ../inet/InetLayer.am
 include ../system/SystemLayer.am
 include ../transport/TransportLayer.am
 include core/CoreLayer.am
+include datamodel/DataModel.am
 include support/SupportLayer.am
 include profiles/ProfilesLayer.am
 include ../crypto/Crypto.am
@@ -46,6 +47,9 @@ include ../app/DataModel.am
 CoreLayer_dir=$(includedir)/core
 dist_CoreLayer__HEADERS=$(CHIP_BUILD_CORE_LAYER_HEADER_FILES)
 
+# install headers for datamodel layer
+DataModel_dir=$(includedir)/datamodel
+dist_DataModel__HEADERS=$(CHIP_BUILD_DATAMODEL_LAYER_HEADER_FILES)
 # install headers for DeviceController
 Controller_dir=$(includedir)/controller
 dist_Controller__HEADERS=$(CHIP_BUILD_DEVICE_CONTROLLER_HEADER_FILES)
@@ -73,6 +77,7 @@ libCHIP_a_CPPFLAGS                  =                         \
 libCHIP_a_SOURCES                   = $(CHIP_BUILD_SYSTEM_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_INET_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_CORE_LAYER_SOURCE_FILES)
+libCHIP_a_SOURCES                  += $(CHIP_BUILD_DATAMODEL_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_SUPPORT_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_DEVICE_CONTROLLER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_DATA_MODEL_SOURCE_FILES)
diff --git a/src/lib/core/CoreLayer.am b/src/lib/core/CoreLayer.am
index 496c31a2bbb1d4..a0dbfce75e0ab2 100644
--- a/src/lib/core/CoreLayer.am
+++ b/src/lib/core/CoreLayer.am
@@ -32,7 +32,6 @@ CHIP_BUILD_CORE_LAYER_SOURCE_FILES                        = \
     @top_builddir@/src/lib/core/CHIPTLVWriter.cpp           \
     @top_builddir@/src/lib/core/CHIPTLVUpdater.cpp          \
     @top_builddir@/src/lib/core/CHIPKeyIds.cpp              \
-    @top_builddir@/src/lib/core/CHIPEndPoint.cpp            \
     $(NULL)
 
 CHIP_BUILD_CORE_LAYER_HEADER_FILES                        = \
@@ -55,11 +54,4 @@ CHIP_BUILD_CORE_LAYER_HEADER_FILES                        = \
     @top_builddir@/src/lib/core/Optional.h                  \
     @top_builddir@/src/lib/core/ReferenceCounted.h          \
     @top_builddir@/src/lib/core/CHIPVendorIdentifiers.hpp   \
-    @top_builddir@/src/lib/core/CHIPBaseAttribute.h   \
-    @top_builddir@/src/lib/core/CHIPBaseCluster.h   \
-    @top_builddir@/src/lib/core/CHIPClusterServer.h   \
-    @top_builddir@/src/lib/core/CHIPEndPoint.h   \
-    @top_builddir@/src/lib/core/CHIPStandardAttributes.h   \
-    @top_builddir@/src/lib/core/CHIPStandardClusters.h   \
-    @top_builddir@/src/lib/core/CHIPValues.h   \
     $(NULL)
diff --git a/src/lib/core/CHIPBaseAttribute.h b/src/lib/datamodel/CHIPBaseAttribute.h
similarity index 98%
rename from src/lib/core/CHIPBaseAttribute.h
rename to src/lib/datamodel/CHIPBaseAttribute.h
index 17bd985757aaae..6e5fb67d7ed803 100644
--- a/src/lib/core/CHIPBaseAttribute.h
+++ b/src/lib/datamodel/CHIPBaseAttribute.h
@@ -24,7 +24,7 @@
 #ifndef CHIPATTRIBUTES_H_
 #define CHIPATTRIBUTES_H_
 
-#include <lib/core/CHIPValues.h>
+#include <lib/datamodel/CHIPValues.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPBaseCluster.h b/src/lib/datamodel/CHIPBaseCluster.h
similarity index 98%
rename from src/lib/core/CHIPBaseCluster.h
rename to src/lib/datamodel/CHIPBaseCluster.h
index b71b2835fef99b..c76cb4322e183d 100644
--- a/src/lib/core/CHIPBaseCluster.h
+++ b/src/lib/datamodel/CHIPBaseCluster.h
@@ -24,7 +24,7 @@
 #ifndef CHIPBASECLUSTER_H_
 #define CHIPBASECLUSTER_H_
 
-#include <lib/core/CHIPBaseAttribute.h>
+#include <lib/datamodel/CHIPBaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPClusterServer.h b/src/lib/datamodel/CHIPClusterServer.h
similarity index 98%
rename from src/lib/core/CHIPClusterServer.h
rename to src/lib/datamodel/CHIPClusterServer.h
index d7bc859d3f7df1..cd75b70e218052 100644
--- a/src/lib/core/CHIPClusterServer.h
+++ b/src/lib/datamodel/CHIPClusterServer.h
@@ -25,7 +25,7 @@
 #ifndef CHIPCLUSTERSERVER_H_
 #define CHIPCLUSTERSERVER_H_
 
-#include <lib/core/CHIPEndPoint.h>
+#include <lib/datamodel/CHIPEndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPEndPoint.cpp b/src/lib/datamodel/CHIPEndPoint.cpp
similarity index 95%
rename from src/lib/core/CHIPEndPoint.cpp
rename to src/lib/datamodel/CHIPEndPoint.cpp
index 1cde502794401e..b05c12b3132055 100644
--- a/src/lib/core/CHIPEndPoint.cpp
+++ b/src/lib/datamodel/CHIPEndPoint.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <lib/core/CHIPEndPoint.h>
+#include <lib/datamodel/CHIPEndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPEndPoint.h b/src/lib/datamodel/CHIPEndPoint.h
similarity index 96%
rename from src/lib/core/CHIPEndPoint.h
rename to src/lib/datamodel/CHIPEndPoint.h
index 8ac5b9e1af7aa6..708a116ee322ae 100644
--- a/src/lib/core/CHIPEndPoint.h
+++ b/src/lib/datamodel/CHIPEndPoint.h
@@ -24,8 +24,8 @@
 #ifndef CHIPENDPOINT_H_
 #define CHIPENDPOINT_H_
 
-#include <lib/core/CHIPBaseAttribute.h>
-#include <lib/core/CHIPStandardClusters.h>
+#include <lib/datamodel/CHIPBaseAttribute.h>
+#include <lib/datamodel/CHIPStandardClusters.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPStandardAttributes.h b/src/lib/datamodel/CHIPStandardAttributes.h
similarity index 98%
rename from src/lib/core/CHIPStandardAttributes.h
rename to src/lib/datamodel/CHIPStandardAttributes.h
index 114e47b337133a..36822b3549c90f 100644
--- a/src/lib/core/CHIPStandardAttributes.h
+++ b/src/lib/datamodel/CHIPStandardAttributes.h
@@ -24,7 +24,7 @@
 #ifndef CHIPSTANDARDATTRIBUTES_H_
 #define CHIPSTANDARDATTRIBUTES_H_
 
-#include <lib/core/CHIPBaseAttribute.h>
+#include <lib/datamodel/CHIPBaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPStandardClusters.h b/src/lib/datamodel/CHIPStandardClusters.h
similarity index 95%
rename from src/lib/core/CHIPStandardClusters.h
rename to src/lib/datamodel/CHIPStandardClusters.h
index 9c547df335cc0b..abd0c27953cd39 100644
--- a/src/lib/core/CHIPStandardClusters.h
+++ b/src/lib/datamodel/CHIPStandardClusters.h
@@ -24,8 +24,8 @@
 #ifndef CHIPSTANDARDCLUSTERS_H_
 #define CHIPSTANDARDCLUSTERS_H_
 
-#include <lib/core/CHIPBaseCluster.h>
-#include <lib/core/CHIPStandardAttributes.h>
+#include <lib/datamodel/CHIPBaseCluster.h>
+#include <lib/datamodel/CHIPStandardAttributes.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/core/CHIPValues.h b/src/lib/datamodel/CHIPValues.h
similarity index 100%
rename from src/lib/core/CHIPValues.h
rename to src/lib/datamodel/CHIPValues.h
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
new file mode 100644
index 00000000000000..2c5a9b8ff8fcf8
--- /dev/null
+++ b/src/lib/datamodel/DataModel.am
@@ -0,0 +1,38 @@
+#
+#    Copyright (c) 2020 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.
+#
+
+#
+#    Description:
+#      This file is the GNU automake template for the CHIP 
+#      library DataModel sources.
+#
+#      These sources are shared by other SDK makefiles and consequently
+#      must be anchored relative to the top build directory.
+#
+
+CHIP_BUILD_DATAMODEL_LAYER_SOURCE_FILES                   = \
+    @top_builddir@/src/lib/datamodel/CHIPEndPoint.cpp       \
+    $(NULL)
+
+CHIP_BUILD_DATAMODEL_LAYER_HEADER_FILES                   = \
+    @top_builddir@/src/lib/datamodel/CHIPBaseAttribute.h         \
+    @top_builddir@/src/lib/datamodel/CHIPBaseCluster.h           \
+    @top_builddir@/src/lib/datamodel/CHIPClusterServer.h         \
+    @top_builddir@/src/lib/datamodel/CHIPEndPoint.h              \
+    @top_builddir@/src/lib/datamodel/CHIPStandardAttributes.h    \
+    @top_builddir@/src/lib/datamodel/CHIPStandardClusters.h      \
+    @top_builddir@/src/lib/datamodel/CHIPValues.h                \
+    $(NULL)

From 825133e2703261012b401ed3c88f5db723dab048 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 8 Jul 2020 20:19:29 +0530
Subject: [PATCH 11/74] Use a static allocation of the Basic Cluster instead of
 on the heap

This saves us from having to decide when to free it
---
 src/lib/datamodel/CHIPEndPoint.cpp       |  2 +-
 src/lib/datamodel/CHIPEndPoint.h         | 11 ++++-------
 src/lib/datamodel/CHIPStandardClusters.h | 19 +++++++++++++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/lib/datamodel/CHIPEndPoint.cpp b/src/lib/datamodel/CHIPEndPoint.cpp
index b05c12b3132055..d7e861e52a5039 100644
--- a/src/lib/datamodel/CHIPEndPoint.cpp
+++ b/src/lib/datamodel/CHIPEndPoint.cpp
@@ -26,7 +26,7 @@
 namespace chip {
 namespace DataModel {
 
-BaseCluster * EndPoint::mBasicCluster = nullptr;
+ClusterBasic EndPoint::mBasicCluster;
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/datamodel/CHIPEndPoint.h b/src/lib/datamodel/CHIPEndPoint.h
index 708a116ee322ae..85c520eed46c74 100644
--- a/src/lib/datamodel/CHIPEndPoint.h
+++ b/src/lib/datamodel/CHIPEndPoint.h
@@ -35,21 +35,18 @@ static const uint8_t kMaxClustersPerEndPoint = 5;
 class EndPoint
 {
 public:
-    static BaseCluster * mBasicCluster;
+    static ClusterBasic mBasicCluster;
     BaseCluster * mClusters[kMaxClustersPerEndPoint];
 
     EndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
     {
-        if (mBasicCluster == nullptr)
-        {
-            mBasicCluster = new ClusterBasic(ZCLVersion, applicationVersion, stackVersion, HWVersion);
-            /* TODO: allocation failure? */
-        }
-        mClusters[0] = mBasicCluster;
+        mBasicCluster.Init(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+        mClusters[0] = &mBasicCluster;
     }
 
     virtual ~EndPoint()
     {
+        /* The 0th index is not dynamically allocated */
         for (int i = 1; i < kMaxClustersPerEndPoint; i++)
         {
             if (mClusters[i] != nullptr)
diff --git a/src/lib/datamodel/CHIPStandardClusters.h b/src/lib/datamodel/CHIPStandardClusters.h
index abd0c27953cd39..316f0a46547c4d 100644
--- a/src/lib/datamodel/CHIPStandardClusters.h
+++ b/src/lib/datamodel/CHIPStandardClusters.h
@@ -34,13 +34,24 @@ static const uint16_t kClusterIdBase = 0x0000;
 class ClusterBasic : public BaseCluster
 {
 public:
+    ClusterBasic() : BaseCluster(kClusterIdBase) {}
+
+    int Init(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion)
+    {
+        if (mAttrs[0] == nullptr)
+        {
+            AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
+            AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
+            AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
+            AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
+        }
+        return SUCCESS;
+    }
+    
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
         BaseCluster(kClusterIdBase)
     {
-        AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
-        AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
-        AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
-        AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
+        Init(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     }
 };
 

From 8ef76bfffa96be823caf2a12f0e81f750b1b1b7c Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 8 Jul 2020 11:24:44 -0700
Subject: [PATCH 12/74] add skeleton tests directory, tweaks to make system

---
 configure.ac                                  |   2 +
 src/lib/Makefile.am                           |   6 +-
 src/lib/datamodel/CHIPBaseAttribute.h         |   2 +-
 src/lib/datamodel/CHIPBaseCluster.h           |   2 +-
 src/lib/datamodel/CHIPClusterServer.h         |   2 +-
 src/lib/datamodel/CHIPEndPoint.cpp            |   2 +-
 src/lib/datamodel/CHIPEndPoint.h              |   4 +-
 src/lib/datamodel/CHIPStandardAttributes.h    |   2 +-
 src/lib/datamodel/CHIPStandardClusters.h      |   6 +-
 src/lib/datamodel/DataModel.am                |   4 +-
 src/lib/datamodel/Makefile.am                 |  48 ++++++
 src/lib/datamodel/tests/Makefile.am           | 155 ++++++++++++++++++
 src/lib/datamodel/tests/TestClusterServer.cpp |  67 ++++++++
 src/lib/datamodel/tests/TestDriver.cpp        |  36 ++++
 src/lib/datamodel/tests/qemu_system_tests.sh  |  50 ++++++
 15 files changed, 374 insertions(+), 14 deletions(-)
 create mode 100644 src/lib/datamodel/Makefile.am
 create mode 100644 src/lib/datamodel/tests/Makefile.am
 create mode 100644 src/lib/datamodel/tests/TestClusterServer.cpp
 create mode 100644 src/lib/datamodel/tests/TestDriver.cpp
 create mode 100644 src/lib/datamodel/tests/qemu_system_tests.sh

diff --git a/configure.ac b/configure.ac
index b48c5c0761fa09..9c060bf0b7bb7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2231,6 +2231,8 @@ src/inet/Makefile
 src/inet/tests/Makefile
 src/lib/Makefile
 src/lib/core/tests/Makefile
+src/lib/datamodel/Makefile
+src/lib/datamodel/tests/Makefile
 src/lib/shell/Makefile
 src/lib/shell/tests/Makefile
 src/lib/support/Makefile
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f396e097f7766f..6d4d4213e277d9 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS                             =                         \
     shell                                                     \
     support                                                   \
     core/tests                                                \
+    datamodel                                                 \
     $(NULL)
 
 # Pull in the sources that comprise the CHIP library.
@@ -49,7 +50,8 @@ dist_CoreLayer__HEADERS=$(CHIP_BUILD_CORE_LAYER_HEADER_FILES)
 
 # install headers for datamodel layer
 DataModel_dir=$(includedir)/datamodel
-dist_DataModel__HEADERS=$(CHIP_BUILD_DATAMODEL_LAYER_HEADER_FILES)
+dist_DataModel__HEADERS=$(CHIP_BUILD_DATAMODEL_HEADER_FILES)
+
 # install headers for DeviceController
 Controller_dir=$(includedir)/controller
 dist_Controller__HEADERS=$(CHIP_BUILD_DEVICE_CONTROLLER_HEADER_FILES)
@@ -77,7 +79,7 @@ libCHIP_a_CPPFLAGS                  =                         \
 libCHIP_a_SOURCES                   = $(CHIP_BUILD_SYSTEM_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_INET_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_CORE_LAYER_SOURCE_FILES)
-libCHIP_a_SOURCES                  += $(CHIP_BUILD_DATAMODEL_LAYER_SOURCE_FILES)
+libCHIP_a_SOURCES                  += $(CHIP_BUILD_DATAMODEL_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_SUPPORT_LAYER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_DEVICE_CONTROLLER_SOURCE_FILES)
 libCHIP_a_SOURCES                  += $(CHIP_BUILD_DATA_MODEL_SOURCE_FILES)
diff --git a/src/lib/datamodel/CHIPBaseAttribute.h b/src/lib/datamodel/CHIPBaseAttribute.h
index 6e5fb67d7ed803..e59fe14bd59822 100644
--- a/src/lib/datamodel/CHIPBaseAttribute.h
+++ b/src/lib/datamodel/CHIPBaseAttribute.h
@@ -24,7 +24,7 @@
 #ifndef CHIPATTRIBUTES_H_
 #define CHIPATTRIBUTES_H_
 
-#include <lib/datamodel/CHIPValues.h>
+#include <datamodel/CHIPValues.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPBaseCluster.h b/src/lib/datamodel/CHIPBaseCluster.h
index c76cb4322e183d..770bc4b98f0684 100644
--- a/src/lib/datamodel/CHIPBaseCluster.h
+++ b/src/lib/datamodel/CHIPBaseCluster.h
@@ -24,7 +24,7 @@
 #ifndef CHIPBASECLUSTER_H_
 #define CHIPBASECLUSTER_H_
 
-#include <lib/datamodel/CHIPBaseAttribute.h>
+#include <datamodel/CHIPBaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPClusterServer.h b/src/lib/datamodel/CHIPClusterServer.h
index cd75b70e218052..9bfc50df8b0133 100644
--- a/src/lib/datamodel/CHIPClusterServer.h
+++ b/src/lib/datamodel/CHIPClusterServer.h
@@ -25,7 +25,7 @@
 #ifndef CHIPCLUSTERSERVER_H_
 #define CHIPCLUSTERSERVER_H_
 
-#include <lib/datamodel/CHIPEndPoint.h>
+#include <datamodel/CHIPEndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPEndPoint.cpp b/src/lib/datamodel/CHIPEndPoint.cpp
index d7e861e52a5039..3e9e6c944d66fa 100644
--- a/src/lib/datamodel/CHIPEndPoint.cpp
+++ b/src/lib/datamodel/CHIPEndPoint.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <lib/datamodel/CHIPEndPoint.h>
+#include <datamodel/CHIPEndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPEndPoint.h b/src/lib/datamodel/CHIPEndPoint.h
index 85c520eed46c74..4824a38d0e6af2 100644
--- a/src/lib/datamodel/CHIPEndPoint.h
+++ b/src/lib/datamodel/CHIPEndPoint.h
@@ -24,8 +24,8 @@
 #ifndef CHIPENDPOINT_H_
 #define CHIPENDPOINT_H_
 
-#include <lib/datamodel/CHIPBaseAttribute.h>
-#include <lib/datamodel/CHIPStandardClusters.h>
+#include <datamodel/CHIPBaseAttribute.h>
+#include <datamodel/CHIPStandardClusters.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPStandardAttributes.h b/src/lib/datamodel/CHIPStandardAttributes.h
index 36822b3549c90f..6aa583f0280b2a 100644
--- a/src/lib/datamodel/CHIPStandardAttributes.h
+++ b/src/lib/datamodel/CHIPStandardAttributes.h
@@ -24,7 +24,7 @@
 #ifndef CHIPSTANDARDATTRIBUTES_H_
 #define CHIPSTANDARDATTRIBUTES_H_
 
-#include <lib/datamodel/CHIPBaseAttribute.h>
+#include <datamodel/CHIPBaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPStandardClusters.h b/src/lib/datamodel/CHIPStandardClusters.h
index 316f0a46547c4d..28afe14f26f7f9 100644
--- a/src/lib/datamodel/CHIPStandardClusters.h
+++ b/src/lib/datamodel/CHIPStandardClusters.h
@@ -24,8 +24,8 @@
 #ifndef CHIPSTANDARDCLUSTERS_H_
 #define CHIPSTANDARDCLUSTERS_H_
 
-#include <lib/datamodel/CHIPBaseCluster.h>
-#include <lib/datamodel/CHIPStandardAttributes.h>
+#include <datamodel/CHIPBaseCluster.h>
+#include <datamodel/CHIPStandardAttributes.h>
 
 namespace chip {
 namespace DataModel {
@@ -47,7 +47,7 @@ class ClusterBasic : public BaseCluster
         }
         return SUCCESS;
     }
-    
+
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
         BaseCluster(kClusterIdBase)
     {
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index 2c5a9b8ff8fcf8..ebc81b92aab7ba 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -23,11 +23,11 @@
 #      must be anchored relative to the top build directory.
 #
 
-CHIP_BUILD_DATAMODEL_LAYER_SOURCE_FILES                   = \
+CHIP_BUILD_DATAMODEL_SOURCE_FILES                         = \
     @top_builddir@/src/lib/datamodel/CHIPEndPoint.cpp       \
     $(NULL)
 
-CHIP_BUILD_DATAMODEL_LAYER_HEADER_FILES                   = \
+CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/CHIPBaseAttribute.h         \
     @top_builddir@/src/lib/datamodel/CHIPBaseCluster.h           \
     @top_builddir@/src/lib/datamodel/CHIPClusterServer.h         \
diff --git a/src/lib/datamodel/Makefile.am b/src/lib/datamodel/Makefile.am
new file mode 100644
index 00000000000000..23015ba9785ab2
--- /dev/null
+++ b/src/lib/datamodel/Makefile.am
@@ -0,0 +1,48 @@
+#
+#    Copyright (c) 2020 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.
+#
+
+#
+#    Description:
+#      This file is the GNU automake template for the CHIP system layer
+#      library.
+#
+
+include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
+
+include DataModel.am
+
+SUBDIRS                             = \
+    tests                             \
+    $(NULL)
+
+EXTRA_DIST                          = \
+    $(NULL)
+
+lib_LIBRARIES                       = libDataModel.a
+
+libDataModel_a_CPPFLAGS             = \
+    -I$(top_srcdir)/src               \
+    -I$(top_srcdir)/src/include       \
+    -I$(top_srcdir)/src/lib           \
+    $(NULL)
+
+libDataModel_a_SOURCES          = $(CHIP_BUILD_DATAMODEL_SOURCE_FILES)
+
+libDataModel_adir               = $(includedir)/datamodel
+
+dist_libDataModel_a_HEADERS     = $(CHIP_BUILD_DATAMODEL_HEADER_FILES)
+
+include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/src/lib/datamodel/tests/Makefile.am b/src/lib/datamodel/tests/Makefile.am
new file mode 100644
index 00000000000000..a69cfec349b521
--- /dev/null
+++ b/src/lib/datamodel/tests/Makefile.am
@@ -0,0 +1,155 @@
+#
+#    Copyright (c) 2020 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.
+#
+
+#
+#    Description:
+#      This file is the GNU automake makefile for the Project CHIP
+#      App layer (i.e. cluster library) unit tests.
+#
+
+include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
+
+#
+# Local headers to build against and distribute but not to install
+# since they are not part of the package.
+#
+noinst_HEADERS                                        = \
+    $(NULL)
+
+#
+# Other files we do want to distribute with the package.
+#
+EXTRA_DIST                                            = \
+    $(NULL)
+
+if CHIP_BUILD_TESTS
+lib_LIBRARIES                                         = \
+    libDataModelTests.a                                 \
+    $(NULL)
+
+libDataModelTests_a_SOURCES                       = \
+    TestClusterServer.cpp                           \
+    $(NULL)
+
+# C/C++ preprocessor option flags that will apply to all compiled
+# objects in this makefile.
+
+AM_CPPFLAGS                                           = \
+    -I$(top_srcdir)/src                                 \
+    -I$(top_srcdir)/src/lib                             \
+    $(NLASSERT_CPPFLAGS)                                \
+    $(NLUNIT_TEST_CPPFLAGS)                             \
+    $(NULL)
+
+CHIP_LDADD                                            = \
+    $(top_builddir)/src/lib/support/libSupportLayer.a   \
+    $(top_builddir)/src/lib/datamodel/libDataModel.a    \
+    $(NULL)
+
+COMMON_LDADD                                           = \
+    libDataModelTests.a                                  \
+    $(COMMON_LDFLAGS)                                    \
+    $(CHIP_LDADD)                                        \
+    $(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS)           \
+    $(NULL)
+
+# Test applications that should be run when the 'check' target is run.
+
+check_PROGRAMS                                        = \
+    $(NULL)
+
+check_SCRIPTS                                         = \
+    $(NULL)
+
+# The additional environment variables and their values that will be
+# made available to all programs and scripts in TESTS.
+TESTS_ENVIRONMENT                                      = \
+    $(NULL)
+
+if CHIP_DEVICE_LAYER_TARGET_ESP32
+
+check_SCRIPTS                                         += \
+    qemu_app_tests.sh                                    \
+    $(NULL)
+
+TESTS_ENVIRONMENT                                     += \
+    abs_top_srcdir='$(abs_top_srcdir)'                   \
+    abs_top_builddir='$(abs_top_builddir)'               \
+    QEMU_TEST_TARGET=libAppLayerTests.a                  \
+    $(NULL)
+
+else # CHIP_DEVICE_LAYER_TARGET_ESP32
+
+check_PROGRAMS                                       += \
+    TestAppLayer                                        \
+    $(NULL)
+
+endif # CHIP_DEVICE_LAYER_TARGET_ESP32
+
+# Test applications and scripts that should be built and run when the
+# 'check' target is run.
+
+TESTS                                                 = \
+    $(check_PROGRAMS)                                   \
+    $(check_SCRIPTS)                                    \
+    $(NULL)
+
+# Source, compiler, and linker options for test programs.
+
+TestAppLayer_SOURCES                                  = TestDriver.cpp
+TestAppLayer_LDADD                                    = $(COMMON_LDADD)
+
+#
+# Foreign make dependencies
+#
+
+NLFOREIGN_FILE_DEPENDENCIES                           = \
+   $(CHIP_LDADD)                                        \
+   $(NULL)
+
+NLFOREIGN_SUBDIR_DEPENDENCIES                         = \
+   $(NLUNIT_TEST_FOREIGN_SUBDIR_DEPENDENCY)             \
+   $(NULL)
+
+if CHIP_BUILD_COVERAGE
+CLEANFILES                                            = $(wildcard *.gcda *.gcno)
+
+if CHIP_BUILD_COVERAGE_REPORTS
+# The bundle should positively be qualified with the absolute build
+# path. Otherwise, VPATH will get auto-prefixed to it if there is
+# already such a directory in the non-colocated source tree.
+
+CHIP_COVERAGE_BUNDLE                                  = ${abs_builddir}/${PACKAGE}${NL_COVERAGE_BUNDLE_SUFFIX}
+CHIP_COVERAGE_INFO                                    = ${CHIP_COVERAGE_BUNDLE}/${PACKAGE}${NL_COVERAGE_INFO_SUFFIX}
+
+$(CHIP_COVERAGE_BUNDLE):
+	$(call create-directory)
+
+$(CHIP_COVERAGE_INFO): check-local | $(CHIP_COVERAGE_BUNDLE)
+	$(call generate-coverage-report,${top_builddir},*/usr/include/* */third_party/*)
+
+coverage-local: $(CHIP_COVERAGE_INFO)
+
+clean-local: clean-local-coverage
+
+.PHONY: clean-local-coverage
+clean-local-coverage:
+	-$(AM_V_at)rm -rf $(CHIP_COVERAGE_BUNDLE)
+endif # CHIP_BUILD_COVERAGE_REPORTS
+endif # CHIP_BUILD_COVERAGE
+endif # CHIP_BUILD_TESTS
+
+include $(abs_top_nlbuild_autotools_dir)/automake/post.am
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
new file mode 100644
index 00000000000000..e7114889f6d015
--- /dev/null
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -0,0 +1,67 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ * @file
+ *    This is a unit test suite for <tt>chip::App::AttributeStorage</tt>.
+ */
+
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
+#include <datamodel/CHIPClusterServer.h>
+#include <nlassert.h>
+#include <nlunit-test.h>
+#include <support/TestUtils.h>
+
+namespace {
+
+void TestClusterServer(nlTestSuite * inSuite, void * inContext)
+{
+    chip::DataModel::ClusterServer server(0, 0, 0, 0);
+}
+
+} // namespace
+
+/**
+ *   Test Suite. It lists all the test functions.
+ */
+// clang-format off
+static const nlTest sTests[] =
+{
+    NL_TEST_DEF("TestClusterServer", TestClusterServer),
+    NL_TEST_SENTINEL()
+};
+// clang-format on
+
+int TestClusterServer(void)
+{
+    nlTestSuite theSuite = {
+        "TestClusterServer", &sTests[0], NULL /* setup */, NULL /* teardown */
+    };
+
+    // Run test suit againt one context.
+    nlTestRunner(&theSuite, NULL /* context */);
+
+    return (nlTestRunnerStats(&theSuite));
+}
+
+static void __attribute__((constructor)) TestTimeSourceCtor(void)
+{
+    nlABORT(chip::RegisterUnitTests(&TestClusterServer) == CHIP_NO_ERROR);
+}
diff --git a/src/lib/datamodel/tests/TestDriver.cpp b/src/lib/datamodel/tests/TestDriver.cpp
new file mode 100644
index 00000000000000..e9dac883b13f74
--- /dev/null
+++ b/src/lib/datamodel/tests/TestDriver.cpp
@@ -0,0 +1,36 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file implements a standalone/native program executable
+ *      test driver for the CHIP app layer library attribute storage unit
+ *      tests.
+ *
+ */
+
+#include <support/TestUtils.h>
+
+#include <nlunit-test.h>
+
+int main(void)
+{
+    // Generate machine-readable, comma-separated value (CSV) output.
+    nlTestSetOutputStyle(OUTPUT_CSV);
+
+    return chip::RunRegisteredUnitTests();
+}
diff --git a/src/lib/datamodel/tests/qemu_system_tests.sh b/src/lib/datamodel/tests/qemu_system_tests.sh
new file mode 100644
index 00000000000000..42614f393c58d0
--- /dev/null
+++ b/src/lib/datamodel/tests/qemu_system_tests.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+#
+#
+#    Copyright (c) 2020 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.
+#
+#
+#    Description:
+#      This is a utility script that runs CHIP tests using ESP32 QEMU.
+#
+
+set -e
+
+die() {
+    echo "$me: *** ERROR: " "${*}"
+    exit 1
+}
+
+source "$abs_top_builddir"/env.sh
+bash "$abs_top_builddir"/esp32_elf_builder.sh "$QEMU_TEST_TARGET"
+
+flash_image_file=$(mktemp)
+log_file=$(mktemp)
+trap "{ rm -f $flash_image_file $log_file; }" EXIT
+
+"$abs_top_srcdir"/scripts/tools/build_esp32_flash_image.sh "$abs_top_builddir"/chip-tests.bin "$flash_image_file"
+"$abs_top_srcdir"/scripts/tools/esp32_qemu_run.sh "$flash_image_file" | tee "$log_file"
+
+# If the logs contain failure message
+if grep -F "] : FAILED" "$log_file"; then
+    die 'Some tests failed.'
+fi
+
+# If the logs do not contain final success status
+if grep -F "CHIP-tests: CHIP test status: 0" "$log_file"; then
+    echo "$me: All tests passed"
+else
+    die 'Tests did not run to completion.'
+fi

From 3424e9e87b9fb0479e062e513e0ee2e0005945b7 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 8 Jul 2020 11:42:39 -0700
Subject: [PATCH 13/74] fixup

---
 src/lib/datamodel/tests/TestClusterServer.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index e7114889f6d015..4aedd210375cc3 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -38,19 +38,13 @@ void TestClusterServer(nlTestSuite * inSuite, void * inContext)
 
 } // namespace
 
-/**
- *   Test Suite. It lists all the test functions.
- */
-// clang-format off
-static const nlTest sTests[] =
-{
-    NL_TEST_DEF("TestClusterServer", TestClusterServer),
-    NL_TEST_SENTINEL()
-};
-// clang-format on
-
 int TestClusterServer(void)
 {
+    /**
+     *   Test Suite. It lists all the test functions.
+     */
+    static const nlTest sTests[] = { NL_TEST_DEF("TestClusterServer", TestClusterServer), NL_TEST_SENTINEL() };
+
     nlTestSuite theSuite = {
         "TestClusterServer", &sTests[0], NULL /* setup */, NULL /* teardown */
     };
@@ -61,7 +55,7 @@ int TestClusterServer(void)
     return (nlTestRunnerStats(&theSuite));
 }
 
-static void __attribute__((constructor)) TestTimeSourceCtor(void)
+static void __attribute__((constructor)) Ctor(void)
 {
     nlABORT(chip::RegisterUnitTests(&TestClusterServer) == CHIP_NO_ERROR);
 }

From d4e4f5446612c3a9512641261082800958aaa326 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 8 Jul 2020 12:13:53 -0700
Subject: [PATCH 14/74] remove CHIP for files that live in datamodel/ subdir

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp    |  2 +-
 .../wifi-echo/server/esp32/main/LEDWidget.cpp    |  2 +-
 .../server/esp32/main/include/LEDWidget.h        |  2 +-
 .../wifi-echo/server/esp32/main/wifi-echo.cpp    |  2 +-
 .../{CHIPBaseAttribute.h => BaseAttribute.h}     |  2 +-
 .../{CHIPBaseCluster.h => BaseCluster.h}         |  2 +-
 .../{CHIPClusterServer.h => ClusterServer.h}     |  2 +-
 src/lib/datamodel/DataModel.am                   | 16 ++++++++--------
 .../datamodel/{CHIPEndPoint.cpp => EndPoint.cpp} |  2 +-
 src/lib/datamodel/{CHIPEndPoint.h => EndPoint.h} |  4 ++--
 ...StandardAttributes.h => StandardAttributes.h} |  2 +-
 ...CHIPStandardClusters.h => StandardClusters.h} |  4 ++--
 src/lib/datamodel/{CHIPValues.h => Values.h}     |  0
 src/lib/datamodel/tests/TestClusterServer.cpp    |  2 +-
 14 files changed, 22 insertions(+), 22 deletions(-)
 rename src/lib/datamodel/{CHIPBaseAttribute.h => BaseAttribute.h} (98%)
 rename src/lib/datamodel/{CHIPBaseCluster.h => BaseCluster.h} (98%)
 rename src/lib/datamodel/{CHIPClusterServer.h => ClusterServer.h} (98%)
 rename src/lib/datamodel/{CHIPEndPoint.cpp => EndPoint.cpp} (95%)
 rename src/lib/datamodel/{CHIPEndPoint.h => EndPoint.h} (96%)
 rename src/lib/datamodel/{CHIPStandardAttributes.h => StandardAttributes.h} (98%)
 rename src/lib/datamodel/{CHIPStandardClusters.h => StandardClusters.h} (96%)
 rename src/lib/datamodel/{CHIPValues.h => Values.h} (100%)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index a2dc92b472cd44..9439f6af52ff22 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -25,7 +25,7 @@
 
 #include "EchoDeviceCallbacks.h"
 #include "esp_log.h"
-#include <lib/datamodel/CHIPClusterServer.h>
+#include <lib/datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 0ea3e20316a0bc..df132cbda9b329 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -31,7 +31,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
-#include <lib/datamodel/CHIPStandardAttributes.h>
+#include <lib/datamodel/StandardAttributes.h>
 
 #if CONFIG_HAVE_DISPLAY
 // The Y position of the LED Status message on screen as a
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index 3f450b25c49a4e..f8c3dcf1780513 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -27,7 +27,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/timers.h"
-#include <lib/datamodel/CHIPStandardClusters.h>
+#include <lib/datamodel/StandardClusters.h>
 
 class LEDWidget : public chip::DataModel::ClusterOnOff
 {
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index d00dbe3e0d14ee..741ae0bfed0cc8 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -42,7 +42,7 @@
 #include <vector>
 
 #include <crypto/CHIPCryptoPAL.h>
-#include <lib/datamodel/CHIPClusterServer.h>
+#include <lib/datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/ErrorStr.h>
diff --git a/src/lib/datamodel/CHIPBaseAttribute.h b/src/lib/datamodel/BaseAttribute.h
similarity index 98%
rename from src/lib/datamodel/CHIPBaseAttribute.h
rename to src/lib/datamodel/BaseAttribute.h
index e59fe14bd59822..62167f1d5aba3e 100644
--- a/src/lib/datamodel/CHIPBaseAttribute.h
+++ b/src/lib/datamodel/BaseAttribute.h
@@ -24,7 +24,7 @@
 #ifndef CHIPATTRIBUTES_H_
 #define CHIPATTRIBUTES_H_
 
-#include <datamodel/CHIPValues.h>
+#include <datamodel/Values.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPBaseCluster.h b/src/lib/datamodel/BaseCluster.h
similarity index 98%
rename from src/lib/datamodel/CHIPBaseCluster.h
rename to src/lib/datamodel/BaseCluster.h
index 770bc4b98f0684..efcdc46fe25b26 100644
--- a/src/lib/datamodel/CHIPBaseCluster.h
+++ b/src/lib/datamodel/BaseCluster.h
@@ -24,7 +24,7 @@
 #ifndef CHIPBASECLUSTER_H_
 #define CHIPBASECLUSTER_H_
 
-#include <datamodel/CHIPBaseAttribute.h>
+#include <datamodel/BaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPClusterServer.h b/src/lib/datamodel/ClusterServer.h
similarity index 98%
rename from src/lib/datamodel/CHIPClusterServer.h
rename to src/lib/datamodel/ClusterServer.h
index 9bfc50df8b0133..ba2fcb7ff28a96 100644
--- a/src/lib/datamodel/CHIPClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -25,7 +25,7 @@
 #ifndef CHIPCLUSTERSERVER_H_
 #define CHIPCLUSTERSERVER_H_
 
-#include <datamodel/CHIPEndPoint.h>
+#include <datamodel/EndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index ebc81b92aab7ba..8c726667a10dc3 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -24,15 +24,15 @@
 #
 
 CHIP_BUILD_DATAMODEL_SOURCE_FILES                         = \
-    @top_builddir@/src/lib/datamodel/CHIPEndPoint.cpp       \
+    @top_builddir@/src/lib/datamodel/EndPoint.cpp       \
     $(NULL)
 
 CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
-    @top_builddir@/src/lib/datamodel/CHIPBaseAttribute.h         \
-    @top_builddir@/src/lib/datamodel/CHIPBaseCluster.h           \
-    @top_builddir@/src/lib/datamodel/CHIPClusterServer.h         \
-    @top_builddir@/src/lib/datamodel/CHIPEndPoint.h              \
-    @top_builddir@/src/lib/datamodel/CHIPStandardAttributes.h    \
-    @top_builddir@/src/lib/datamodel/CHIPStandardClusters.h      \
-    @top_builddir@/src/lib/datamodel/CHIPValues.h                \
+    @top_builddir@/src/lib/datamodel/BaseAttribute.h         \
+    @top_builddir@/src/lib/datamodel/BaseCluster.h           \
+    @top_builddir@/src/lib/datamodel/ClusterServer.h         \
+    @top_builddir@/src/lib/datamodel/EndPoint.h              \
+    @top_builddir@/src/lib/datamodel/StandardAttributes.h    \
+    @top_builddir@/src/lib/datamodel/StandardClusters.h      \
+    @top_builddir@/src/lib/datamodel/Values.h                \
     $(NULL)
diff --git a/src/lib/datamodel/CHIPEndPoint.cpp b/src/lib/datamodel/EndPoint.cpp
similarity index 95%
rename from src/lib/datamodel/CHIPEndPoint.cpp
rename to src/lib/datamodel/EndPoint.cpp
index 3e9e6c944d66fa..b5b915e772fd1d 100644
--- a/src/lib/datamodel/CHIPEndPoint.cpp
+++ b/src/lib/datamodel/EndPoint.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <datamodel/CHIPEndPoint.h>
+#include <datamodel/EndPoint.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPEndPoint.h b/src/lib/datamodel/EndPoint.h
similarity index 96%
rename from src/lib/datamodel/CHIPEndPoint.h
rename to src/lib/datamodel/EndPoint.h
index 4824a38d0e6af2..9d126151e91994 100644
--- a/src/lib/datamodel/CHIPEndPoint.h
+++ b/src/lib/datamodel/EndPoint.h
@@ -24,8 +24,8 @@
 #ifndef CHIPENDPOINT_H_
 #define CHIPENDPOINT_H_
 
-#include <datamodel/CHIPBaseAttribute.h>
-#include <datamodel/CHIPStandardClusters.h>
+#include <datamodel/BaseAttribute.h>
+#include <datamodel/StandardClusters.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPStandardAttributes.h b/src/lib/datamodel/StandardAttributes.h
similarity index 98%
rename from src/lib/datamodel/CHIPStandardAttributes.h
rename to src/lib/datamodel/StandardAttributes.h
index 6aa583f0280b2a..816515f456842e 100644
--- a/src/lib/datamodel/CHIPStandardAttributes.h
+++ b/src/lib/datamodel/StandardAttributes.h
@@ -24,7 +24,7 @@
 #ifndef CHIPSTANDARDATTRIBUTES_H_
 #define CHIPSTANDARDATTRIBUTES_H_
 
-#include <datamodel/CHIPBaseAttribute.h>
+#include <datamodel/BaseAttribute.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPStandardClusters.h b/src/lib/datamodel/StandardClusters.h
similarity index 96%
rename from src/lib/datamodel/CHIPStandardClusters.h
rename to src/lib/datamodel/StandardClusters.h
index 28afe14f26f7f9..d1d6c043cb33c6 100644
--- a/src/lib/datamodel/CHIPStandardClusters.h
+++ b/src/lib/datamodel/StandardClusters.h
@@ -24,8 +24,8 @@
 #ifndef CHIPSTANDARDCLUSTERS_H_
 #define CHIPSTANDARDCLUSTERS_H_
 
-#include <datamodel/CHIPBaseCluster.h>
-#include <datamodel/CHIPStandardAttributes.h>
+#include <datamodel/BaseCluster.h>
+#include <datamodel/StandardAttributes.h>
 
 namespace chip {
 namespace DataModel {
diff --git a/src/lib/datamodel/CHIPValues.h b/src/lib/datamodel/Values.h
similarity index 100%
rename from src/lib/datamodel/CHIPValues.h
rename to src/lib/datamodel/Values.h
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 4aedd210375cc3..7972aad1f2862f 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -24,7 +24,7 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include <datamodel/CHIPClusterServer.h>
+#include <datamodel/ClusterServer.h>
 #include <nlassert.h>
 #include <nlunit-test.h>
 #include <support/TestUtils.h>

From 5fd8f4446309ba4747842e1b45573d814fda4097 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 8 Jul 2020 13:05:44 -0700
Subject: [PATCH 15/74] more little renames

---
 .../wifi-echo/server/esp32/main/LEDWidget.cpp |  4 +--
 .../{BaseAttribute.h => Attribute.h}          | 16 ++++-----
 .../datamodel/{BaseCluster.h => Cluster.h}    | 14 ++++----
 src/lib/datamodel/ClusterServer.h             |  2 +-
 src/lib/datamodel/DataModel.am                |  6 ++--
 src/lib/datamodel/EndPoint.h                  |  8 ++---
 src/lib/datamodel/StandardAttributes.h        | 34 +++++++++----------
 src/lib/datamodel/StandardClusters.h          | 12 +++----
 src/lib/datamodel/{Values.h => Value.h}       |  6 ++--
 9 files changed, 51 insertions(+), 51 deletions(-)
 rename src/lib/datamodel/{BaseAttribute.h => Attribute.h} (85%)
 rename src/lib/datamodel/{BaseCluster.h => Cluster.h} (87%)
 rename src/lib/datamodel/{Values.h => Value.h} (97%)

diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index df132cbda9b329..4effe3d6bea49f 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -72,7 +72,7 @@ void LEDWidget::Set(bool state)
 {
     mBlinkOnTimeMS = mBlinkOffTimeMS = 0;
     DoSet(state);
-    BaseCluster::Set(kAttributeIdOnOff, ValueBool(state));
+    Cluster::Set(kAttributeIdOnOff, ValueBool(state));
 }
 
 int LEDWidget::Set(uint16_t attrId, const Value & value)
@@ -82,7 +82,7 @@ int LEDWidget::Set(uint16_t attrId, const Value & value)
         printf("Setting value to %d\n", ValueToBool(value));
         DoSet(ValueToBool(value));
         /* Update our internal data model as well */
-        BaseCluster::Set(attrId, value);
+        Cluster::Set(attrId, value);
     }
     return SUCCESS;
 }
diff --git a/src/lib/datamodel/BaseAttribute.h b/src/lib/datamodel/Attribute.h
similarity index 85%
rename from src/lib/datamodel/BaseAttribute.h
rename to src/lib/datamodel/Attribute.h
index 62167f1d5aba3e..a4e941385192f0 100644
--- a/src/lib/datamodel/BaseAttribute.h
+++ b/src/lib/datamodel/Attribute.h
@@ -21,15 +21,15 @@
  *
  */
 
-#ifndef CHIPATTRIBUTES_H_
-#define CHIPATTRIBUTES_H_
+#ifndef CHIP_ATTRIBUTE_H_
+#define CHIP_ATTRIBUTE_H_
 
-#include <datamodel/Values.h>
+#include <datamodel/Value.h>
 
 namespace chip {
 namespace DataModel {
 
-class BaseAttribute
+class Attribute
 {
 public:
     uint16_t mAttrId;
@@ -37,9 +37,9 @@ class BaseAttribute
     Value mMin;
     Value mMax;
 
-    BaseAttribute(uint16_t attrId, ValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
-    BaseAttribute(uint16_t attrId, Value value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
-    BaseAttribute(uint16_t attrId, ValueTypes type, uint64_t min, uint64_t max) :
+    Attribute(uint16_t attrId, ValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
+    Attribute(uint16_t attrId, Value value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
+    Attribute(uint16_t attrId, ValueTypes type, uint64_t min, uint64_t max) :
         mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
     {}
 
@@ -103,4 +103,4 @@ class BaseAttribute
 } // namespace DataModel
 } // namespace chip
 
-#endif /* CHIPATTRIBUTES_H_ */
+#endif /* CHIP_ATTRIBUTE_H_ */
diff --git a/src/lib/datamodel/BaseCluster.h b/src/lib/datamodel/Cluster.h
similarity index 87%
rename from src/lib/datamodel/BaseCluster.h
rename to src/lib/datamodel/Cluster.h
index efcdc46fe25b26..5a5452314efe72 100644
--- a/src/lib/datamodel/BaseCluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -24,22 +24,22 @@
 #ifndef CHIPBASECLUSTER_H_
 #define CHIPBASECLUSTER_H_
 
-#include <datamodel/BaseAttribute.h>
+#include <datamodel/Attribute.h>
 
 namespace chip {
 namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxAttributesPerCluster = 10;
-class BaseCluster
+class Cluster
 {
 public:
     uint16_t mClusterId;
-    BaseAttribute * mAttrs[kMaxAttributesPerCluster];
+    Attribute * mAttrs[kMaxAttributesPerCluster];
 
-    BaseCluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
+    Cluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
 
-    virtual ~BaseCluster()
+    virtual ~Cluster()
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -51,7 +51,7 @@ class BaseCluster
         }
     }
 
-    int AddAttribute(BaseAttribute * attr)
+    int AddAttribute(Attribute * attr)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
@@ -64,7 +64,7 @@ class BaseCluster
         return FAIL;
     }
 
-    BaseAttribute * GetAttribute(uint16_t attrId)
+    Attribute * GetAttribute(uint16_t attrId)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index ba2fcb7ff28a96..2ecf86dfecee63 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -58,7 +58,7 @@ class ClusterServer
     }
 
     /* By default always add to the kEndPointIdStartth endpoint, for simplicity */
-    int AddCluster(BaseCluster * cluster)
+    int AddCluster(Cluster * cluster)
     {
         if (!cluster)
         {
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index 8c726667a10dc3..e5046328f3a9b5 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -28,11 +28,11 @@ CHIP_BUILD_DATAMODEL_SOURCE_FILES                         = \
     $(NULL)
 
 CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
-    @top_builddir@/src/lib/datamodel/BaseAttribute.h         \
-    @top_builddir@/src/lib/datamodel/BaseCluster.h           \
+    @top_builddir@/src/lib/datamodel/Attribute.h         \
+    @top_builddir@/src/lib/datamodel/Cluster.h           \
     @top_builddir@/src/lib/datamodel/ClusterServer.h         \
     @top_builddir@/src/lib/datamodel/EndPoint.h              \
     @top_builddir@/src/lib/datamodel/StandardAttributes.h    \
     @top_builddir@/src/lib/datamodel/StandardClusters.h      \
-    @top_builddir@/src/lib/datamodel/Values.h                \
+    @top_builddir@/src/lib/datamodel/Value.h                \
     $(NULL)
diff --git a/src/lib/datamodel/EndPoint.h b/src/lib/datamodel/EndPoint.h
index 9d126151e91994..427f23c373dac4 100644
--- a/src/lib/datamodel/EndPoint.h
+++ b/src/lib/datamodel/EndPoint.h
@@ -24,7 +24,7 @@
 #ifndef CHIPENDPOINT_H_
 #define CHIPENDPOINT_H_
 
-#include <datamodel/BaseAttribute.h>
+#include <datamodel/Attribute.h>
 #include <datamodel/StandardClusters.h>
 
 namespace chip {
@@ -36,7 +36,7 @@ class EndPoint
 {
 public:
     static ClusterBasic mBasicCluster;
-    BaseCluster * mClusters[kMaxClustersPerEndPoint];
+    Cluster * mClusters[kMaxClustersPerEndPoint];
 
     EndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
     {
@@ -57,7 +57,7 @@ class EndPoint
         }
     }
 
-    int AddCluster(BaseCluster * cluster)
+    int AddCluster(Cluster * cluster)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
@@ -70,7 +70,7 @@ class EndPoint
         return FAIL;
     }
 
-    BaseCluster * GetCluster(uint8_t clusterId)
+    Cluster * GetCluster(uint8_t clusterId)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
diff --git a/src/lib/datamodel/StandardAttributes.h b/src/lib/datamodel/StandardAttributes.h
index 816515f456842e..1afc8e2e04a98f 100644
--- a/src/lib/datamodel/StandardAttributes.h
+++ b/src/lib/datamodel/StandardAttributes.h
@@ -24,7 +24,7 @@
 #ifndef CHIPSTANDARDATTRIBUTES_H_
 #define CHIPSTANDARDATTRIBUTES_H_
 
-#include <datamodel/BaseAttribute.h>
+#include <datamodel/Attribute.h>
 
 namespace chip {
 namespace DataModel {
@@ -32,52 +32,52 @@ namespace DataModel {
 /* TODO: It would be nice to use a pool allocator here once we have one */
 /* Base Cluster */
 static const uint16_t kAttributeIdZCLVersion = 0x0000;
-static inline BaseAttribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
+static inline Attribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
 {
-    return new BaseAttribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
+    return new Attribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
 }
 
 static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static inline BaseAttribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
+static inline Attribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
 {
-    return new BaseAttribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
+    return new Attribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
 }
 
 static const uint16_t kAttributeIdStackVersion = 0x0002;
-static inline BaseAttribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
+static inline Attribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
 {
-    return new BaseAttribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
+    return new Attribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
 }
 
 static const uint16_t kAttributeIdHWVersion = 0x0003;
-static inline BaseAttribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
+static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
 {
-    return new BaseAttribute(0x0003, ValueUInt8(HWVersion));
+    return new Attribute(0x0003, ValueUInt8(HWVersion));
 }
 
 /* On/Off Cluster */
 static const uint16_t kAttributeIdOnOff = 0x0000;
-static inline BaseAttribute * CHIPAttributeOnOffNew(void)
+static inline Attribute * CHIPAttributeOnOffNew(void)
 {
-    return new BaseAttribute(kAttributeIdOnOff, kCHIPValueType_Bool);
+    return new Attribute(kAttributeIdOnOff, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
-static inline BaseAttribute * CHIPAttributeGlobalSceneControlNew(void)
+static inline Attribute * CHIPAttributeGlobalSceneControlNew(void)
 {
-    return new BaseAttribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
+    return new Attribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
 }
 
 static const uint16_t kAttributeIdOnTime = 0x4001;
-static inline BaseAttribute * CHIPAttributeOnTimeNew(void)
+static inline Attribute * CHIPAttributeOnTimeNew(void)
 {
-    return new BaseAttribute(0x4001, kCHIPValueType_UInt16);
+    return new Attribute(0x4001, kCHIPValueType_UInt16);
 }
 
 static const uint16_t kAttributeIdOffWaitTime = 0x4002;
-static inline BaseAttribute * CHIPAttributeOffWaitTimeNew(void)
+static inline Attribute * CHIPAttributeOffWaitTimeNew(void)
 {
-    return new BaseAttribute(0x4002, kCHIPValueType_UInt16);
+    return new Attribute(0x4002, kCHIPValueType_UInt16);
 }
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/StandardClusters.h b/src/lib/datamodel/StandardClusters.h
index d1d6c043cb33c6..455543daf97bbf 100644
--- a/src/lib/datamodel/StandardClusters.h
+++ b/src/lib/datamodel/StandardClusters.h
@@ -24,17 +24,17 @@
 #ifndef CHIPSTANDARDCLUSTERS_H_
 #define CHIPSTANDARDCLUSTERS_H_
 
-#include <datamodel/BaseCluster.h>
+#include <datamodel/Cluster.h>
 #include <datamodel/StandardAttributes.h>
 
 namespace chip {
 namespace DataModel {
 
 static const uint16_t kClusterIdBase = 0x0000;
-class ClusterBasic : public BaseCluster
+class ClusterBasic : public Cluster
 {
 public:
-    ClusterBasic() : BaseCluster(kClusterIdBase) {}
+    ClusterBasic() : Cluster(kClusterIdBase) {}
 
     int Init(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion)
     {
@@ -49,17 +49,17 @@ class ClusterBasic : public BaseCluster
     }
 
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
-        BaseCluster(kClusterIdBase)
+        Cluster(kClusterIdBase)
     {
         Init(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     }
 };
 
 static const uint16_t kClusterIdOnOff = 0x0006;
-class ClusterOnOff : public BaseCluster
+class ClusterOnOff : public Cluster
 {
 public:
-    ClusterOnOff() : BaseCluster(kClusterIdOnOff)
+    ClusterOnOff() : Cluster(kClusterIdOnOff)
     {
         AddAttribute(CHIPAttributeOnOffNew());
         AddAttribute(CHIPAttributeGlobalSceneControlNew());
diff --git a/src/lib/datamodel/Values.h b/src/lib/datamodel/Value.h
similarity index 97%
rename from src/lib/datamodel/Values.h
rename to src/lib/datamodel/Value.h
index 6980a640e933a5..6a86f02daa8479 100644
--- a/src/lib/datamodel/Values.h
+++ b/src/lib/datamodel/Value.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef CHIPVALUES_H_
-#define CHIPVALUES_H_
+#ifndef CHIP_VALUE_H_
+#define CHIP_VALUE_H_
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -124,4 +124,4 @@ static inline uint8_t ValueToUInt8(Value v)
 } // namespace DataModel
 } // namespace chip
 
-#endif /* CHIPVALUES_H_ */
+#endif /* CHIP_VALUE_H */

From 16d78617c8cf39e8a81b7248f34ddca8fd371dce Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 9 Jul 2020 14:00:27 +0530
Subject: [PATCH 16/74] Add tests for ClusterServer

---
 src/lib/datamodel/tests/TestClusterServer.cpp | 129 +++++++++++++++++-
 1 file changed, 125 insertions(+), 4 deletions(-)

diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 7972aad1f2862f..7dcf140bf40e74 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -29,11 +29,129 @@
 #include <nlunit-test.h>
 #include <support/TestUtils.h>
 
+using namespace ::chip::DataModel;
+
 namespace {
 
-void TestClusterServer(nlTestSuite * inSuite, void * inContext)
+void GetValue(ClusterServer& server, uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value &value)
 {
-    chip::DataModel::ClusterServer server(0, 0, 0, 0);
+    auto endpoint = server.mEndPoints[endPointId];
+    for (int j = 0; j < kMaxClustersPerEndPoint; j++)
+    {
+        /* Clusters */
+        if (endpoint->mClusters[j] && endpoint->mClusters[j]->mClusterId == clusterId)
+        {
+            auto cluster = endpoint->mClusters[j];
+            for (int k = 0; k < kMaxAttributesPerCluster; k++)
+            {
+                /* Attributes */
+                if (cluster->mAttrs[k] && cluster->mAttrs[k]->mAttrId == attrId)
+                {
+                    auto attr = cluster->mAttrs[k];
+                    value = attr->mValue;
+                }
+            }
+        }
+    }
+}
+
+void TestClusterServerBasic(nlTestSuite * inSuite, void * inContext)
+{
+    const uint8_t ZCLVersion = 10;
+    const uint8_t applicationVersion = 20;
+    const uint8_t stackVersion = 1;
+    const uint8_t HWVersion = 1;
+    Value value;
+
+    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+
+    /* Validate attributes of the Base Cluster */
+    GetValue(server, 1, kClusterIdBase, kAttributeIdZCLVersion, value);
+    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) != ZCLVersion);
+
+    GetValue(server, 1, kClusterIdBase, kAttributeIdApplicationVersion, value);
+    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == applicationVersion);
+
+    GetValue(server, 1, kClusterIdBase, kAttributeIdStackVersion, value);
+    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == stackVersion);
+
+    GetValue(server, 1, kClusterIdBase, kAttributeIdHWVersion, value);
+    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == HWVersion);
+
+
+}
+
+class testSwitch : public ClusterOnOff
+{
+public:
+    uint8_t mGpioNum;
+    bool mTestVector;
+    testSwitch(uint8_t gpio_no) : mGpioNum(gpio_no),mTestVector(false) {}
+
+    int Set(uint16_t attrId, const Value &value)
+    {
+        switch (attrId)
+        {
+        case kAttributeIdOnOff:
+            /* Set the test vector */
+            mTestVector = true;
+            break;
+        default:
+            /* No action */
+            break;
+        }
+        /* Update into our database */
+        return Cluster::Set(attrId, value);
+    }
+};
+
+void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
+{
+    const uint8_t ZCLVersion = 10;
+    const uint8_t applicationVersion = 20;
+    const uint8_t stackVersion = 1;
+    const uint8_t HWVersion = 1;
+    Value value;
+
+    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    const uint8_t switch1Gpio = 10;
+    auto *switch1 = new testSwitch(switch1Gpio);
+    const uint8_t switch2Gpio = 11;
+    auto *switch2 = new testSwitch(switch2Gpio);
+
+    server.AddCluster(switch1);
+    server.AddCluster(switch2);
+
+    /* Validate attributes of the OnOff Cluster on Endpoint 1 */
+    GetValue(server, 1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
+
+    /* Validate attributes of the OnOff Cluster on Endpoint 2 */
+    GetValue(server, 2, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
+
+
+    /* Test that the Set() on the base class gets redirected to the correct object */
+    /* Set 'true' to switch1 */
+    Cluster *cluster = switch1;
+    cluster->Set(kAttributeIdOnOff, ValueBool(true));
+
+    /* Test the the value in the database is updated */
+    GetValue(server, 1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
+    /* Test that the appropriate function of the derived class was executed */
+    NL_TEST_ASSERT(inSuite, switch1->mTestVector == true);
+
+    /* Set 'true' to switch2 */
+    cluster = switch2;
+    cluster->Set(kAttributeIdOnOff, ValueBool(true));
+
+    /* Test the the value in the database is updated */
+    GetValue(server, 2, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
+    /* Test that the appropriate function of the derived class was executed */
+    NL_TEST_ASSERT(inSuite, switch2->mTestVector == true);
+
 }
 
 } // namespace
@@ -43,7 +161,11 @@ int TestClusterServer(void)
     /**
      *   Test Suite. It lists all the test functions.
      */
-    static const nlTest sTests[] = { NL_TEST_DEF("TestClusterServer", TestClusterServer), NL_TEST_SENTINEL() };
+    static const nlTest sTests[] = {
+        NL_TEST_DEF("TestClusterServerBasic", TestClusterServerBasic),
+        NL_TEST_DEF("TestClusterServerTwoEndpoints", TestClusterServerTwoEndpoints),
+        NL_TEST_SENTINEL()
+    };
 
     nlTestSuite theSuite = {
         "TestClusterServer", &sTests[0], NULL /* setup */, NULL /* teardown */
@@ -51,7 +173,6 @@ int TestClusterServer(void)
 
     // Run test suit againt one context.
     nlTestRunner(&theSuite, NULL /* context */);
-
     return (nlTestRunnerStats(&theSuite));
 }
 

From 19133b5ef8f4117ff6a3bc1e48154befe839da91 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 9 Jul 2020 15:07:10 +0530
Subject: [PATCH 17/74] Use CHIPError.h for errors

For now use CHIP_ERROR_INTERNAL for all errors
---
 examples/wifi-echo/server/esp32/main/LEDWidget.cpp |  4 ++--
 src/lib/datamodel/Attribute.h                      |  9 +++++----
 src/lib/datamodel/Cluster.h                        | 10 +++++-----
 src/lib/datamodel/ClusterServer.h                  | 10 +++++-----
 src/lib/datamodel/EndPoint.h                       |  6 +++---
 src/lib/datamodel/StandardClusters.h               |  4 ++--
 src/lib/datamodel/Value.h                          |  4 ----
 src/lib/datamodel/tests/TestClusterServer.cpp      |  2 +-
 8 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 4effe3d6bea49f..0c9a9aee702d1f 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -75,7 +75,7 @@ void LEDWidget::Set(bool state)
     Cluster::Set(kAttributeIdOnOff, ValueBool(state));
 }
 
-int LEDWidget::Set(uint16_t attrId, const Value & value)
+CHIP_ERROR LEDWidget::Set(uint16_t attrId, const Value & value)
 {
     if (attrId == kAttributeIdOnOff)
     {
@@ -84,7 +84,7 @@ int LEDWidget::Set(uint16_t attrId, const Value & value)
         /* Update our internal data model as well */
         Cluster::Set(attrId, value);
     }
-    return SUCCESS;
+    return CHIP_NO_ERROR;
 }
 
 void LEDWidget::Blink(uint32_t changeRateMS)
diff --git a/src/lib/datamodel/Attribute.h b/src/lib/datamodel/Attribute.h
index a4e941385192f0..12dec56e730291 100644
--- a/src/lib/datamodel/Attribute.h
+++ b/src/lib/datamodel/Attribute.h
@@ -24,6 +24,7 @@
 #ifndef CHIP_ATTRIBUTE_H_
 #define CHIP_ATTRIBUTE_H_
 
+#include <core/CHIPError.h>
 #include <datamodel/Value.h>
 
 namespace chip {
@@ -54,19 +55,19 @@ class Attribute
      *   with a Set() call on the base-ptr. In this case the argument
      *   will be Value.
      */
-    int Set(const Value & newValue)
+    CHIP_ERROR Set(const Value & newValue)
     {
         /* We have to check the element type match in this case */
         if (mValue.mType != newValue.mType)
         {
-            return FAIL;
+            return CHIP_ERROR_INTERNAL;
         }
         if (withinRange(newValue))
         {
             mValue = newValue;
-            return SUCCESS;
+            return CHIP_NO_ERROR;
         }
-        return FAIL;
+        return CHIP_ERROR_INTERNAL;
     }
 
     /* Need to define the behaviour when Value contains pointers
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index 5a5452314efe72..aa64340b037aa3 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -51,17 +51,17 @@ class Cluster
         }
     }
 
-    int AddAttribute(Attribute * attr)
+    CHIP_ERROR AddAttribute(Attribute * attr)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
         {
             if (mAttrs[i] == nullptr)
             {
                 mAttrs[i] = attr;
-                return SUCCESS;
+                return CHIP_NO_ERROR;
             }
         }
-        return FAIL;
+        return CHIP_ERROR_INTERNAL;
     }
 
     Attribute * GetAttribute(uint16_t attrId)
@@ -76,7 +76,7 @@ class Cluster
         return nullptr;
     }
 
-    virtual int Set(uint16_t attrId, const Value & value)
+    virtual CHIP_ERROR Set(uint16_t attrId, const Value & value)
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
@@ -84,7 +84,7 @@ class Cluster
         {
             return attr->Set(value);
         }
-        return FAIL;
+        return CHIP_ERROR_INTERNAL;
     }
 };
 
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 2ecf86dfecee63..db046f261b10d0 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -58,27 +58,27 @@ class ClusterServer
     }
 
     /* By default always add to the kEndPointIdStartth endpoint, for simplicity */
-    int AddCluster(Cluster * cluster)
+    CHIP_ERROR AddCluster(Cluster * cluster)
     {
         if (!cluster)
         {
-            return FAIL;
+            return CHIP_ERROR_INTERNAL;
         }
 
         return mEndPoints[kEndPointIdStart]->AddCluster(cluster);
     }
 
-    int AddEndPoint(EndPoint * endPoint)
+    CHIP_ERROR AddEndPoint(EndPoint * endPoint)
     {
         for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
         {
             if (mEndPoints[i] == nullptr)
             {
                 mEndPoints[i] = endPoint;
-                return SUCCESS;
+                return CHIP_NO_ERROR;
             }
         }
-        return FAIL;
+        return CHIP_ERROR_INTERNAL;
     }
 };
 
diff --git a/src/lib/datamodel/EndPoint.h b/src/lib/datamodel/EndPoint.h
index 427f23c373dac4..f095a7e63d749e 100644
--- a/src/lib/datamodel/EndPoint.h
+++ b/src/lib/datamodel/EndPoint.h
@@ -57,17 +57,17 @@ class EndPoint
         }
     }
 
-    int AddCluster(Cluster * cluster)
+    CHIP_ERROR AddCluster(Cluster * cluster)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
         {
             if (mClusters[i] == nullptr)
             {
                 mClusters[i] = cluster;
-                return SUCCESS;
+                return CHIP_NO_ERROR;
             }
         }
-        return FAIL;
+        return CHIP_ERROR_INTERNAL;
     }
 
     Cluster * GetCluster(uint8_t clusterId)
diff --git a/src/lib/datamodel/StandardClusters.h b/src/lib/datamodel/StandardClusters.h
index 455543daf97bbf..ec48c60e16830c 100644
--- a/src/lib/datamodel/StandardClusters.h
+++ b/src/lib/datamodel/StandardClusters.h
@@ -36,7 +36,7 @@ class ClusterBasic : public Cluster
 public:
     ClusterBasic() : Cluster(kClusterIdBase) {}
 
-    int Init(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion)
+    CHIP_ERROR Init(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion)
     {
         if (mAttrs[0] == nullptr)
         {
@@ -45,7 +45,7 @@ class ClusterBasic : public Cluster
             AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
             AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
         }
-        return SUCCESS;
+        return CHIP_NO_ERROR;
     }
 
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
diff --git a/src/lib/datamodel/Value.h b/src/lib/datamodel/Value.h
index 6a86f02daa8479..35137bf1d2abcb 100644
--- a/src/lib/datamodel/Value.h
+++ b/src/lib/datamodel/Value.h
@@ -32,10 +32,6 @@
 namespace chip {
 namespace DataModel {
 
-/* XXX Remove later*/
-#define SUCCESS 0
-#define FAIL -1
-
 enum ValueTypes
 {
     kCHIPValueType_NotSpecified = -1,
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 7dcf140bf40e74..edcae6b97a6890 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -88,7 +88,7 @@ class testSwitch : public ClusterOnOff
     bool mTestVector;
     testSwitch(uint8_t gpio_no) : mGpioNum(gpio_no),mTestVector(false) {}
 
-    int Set(uint16_t attrId, const Value &value)
+    CHIP_ERROR Set(uint16_t attrId, const Value &value)
     {
         switch (attrId)
         {

From 9b5a74d77527fd631bc2cec6edc879ea1a9bcfba Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 9 Jul 2020 16:00:26 +0530
Subject: [PATCH 18/74] Move standard clusters in their own files

---
 .../wifi-echo/server/esp32/main/LEDWidget.cpp |  2 +-
 .../server/esp32/main/include/LEDWidget.h     |  2 +-
 .../{StandardClusters.h => ClusterBasic.h}    | 51 +++++++++-----
 .../{StandardAttributes.h => ClusterOnOff.h}  | 67 ++++++++++---------
 src/lib/datamodel/DataModel.am                |  4 +-
 src/lib/datamodel/EndPoint.h                  |  2 +-
 6 files changed, 74 insertions(+), 54 deletions(-)
 rename src/lib/datamodel/{StandardClusters.h => ClusterBasic.h} (60%)
 rename src/lib/datamodel/{StandardAttributes.h => ClusterOnOff.h} (55%)

diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 0c9a9aee702d1f..0540d0fbe23cc2 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -31,7 +31,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
-#include <lib/datamodel/StandardAttributes.h>
+#include <lib/datamodel/ClusterOnOff.h>
 
 #if CONFIG_HAVE_DISPLAY
 // The Y position of the LED Status message on screen as a
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index f8c3dcf1780513..f9e815ac390de9 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -27,7 +27,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/timers.h"
-#include <lib/datamodel/StandardClusters.h>
+#include <lib/datamodel/ClusterOnOff.h>
 
 class LEDWidget : public chip::DataModel::ClusterOnOff
 {
diff --git a/src/lib/datamodel/StandardClusters.h b/src/lib/datamodel/ClusterBasic.h
similarity index 60%
rename from src/lib/datamodel/StandardClusters.h
rename to src/lib/datamodel/ClusterBasic.h
index ec48c60e16830c..6317ae6f9eaf92 100644
--- a/src/lib/datamodel/StandardClusters.h
+++ b/src/lib/datamodel/ClusterBasic.h
@@ -17,20 +17,49 @@
 
 /**
  *    @file
- *      This file contains definitions for standard CHIP Clusters
+ *      This file contains definitions for CHIP Cluster Basic
  *
  */
 
-#ifndef CHIPSTANDARDCLUSTERS_H_
-#define CHIPSTANDARDCLUSTERS_H_
+#ifndef CHIPCLUSTERBASIC_H_
+#define CHIPCLUSTERBASIC_H_
 
 #include <datamodel/Cluster.h>
-#include <datamodel/StandardAttributes.h>
 
 namespace chip {
 namespace DataModel {
 
+/* Cluster ID */
 static const uint16_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;
+
+/* Attributes */
+static inline Attribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
+{
+    return new Attribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
+}
+
+static inline Attribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
+{
+    return new Attribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
+}
+
+static inline Attribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
+{
+    return new Attribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
+}
+
+static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
+{
+    return new Attribute(0x0003, ValueUInt8(HWVersion));
+}
+
+/* The Cluster Basic class */
 class ClusterBasic : public Cluster
 {
 public:
@@ -55,20 +84,8 @@ class ClusterBasic : public Cluster
     }
 };
 
-static const uint16_t kClusterIdOnOff = 0x0006;
-class ClusterOnOff : public Cluster
-{
-public:
-    ClusterOnOff() : Cluster(kClusterIdOnOff)
-    {
-        AddAttribute(CHIPAttributeOnOffNew());
-        AddAttribute(CHIPAttributeGlobalSceneControlNew());
-        AddAttribute(CHIPAttributeOnTimeNew());
-        AddAttribute(CHIPAttributeOffWaitTimeNew());
-    }
-};
 
 } // namespace DataModel
 } // namespace chip
 
-#endif /* CHIPSTANDARDCLUSTERS_H_ */
+#endif /* CHIPCLUSTERBASIC_H_ */
diff --git a/src/lib/datamodel/StandardAttributes.h b/src/lib/datamodel/ClusterOnOff.h
similarity index 55%
rename from src/lib/datamodel/StandardAttributes.h
rename to src/lib/datamodel/ClusterOnOff.h
index 1afc8e2e04a98f..c84a9f27f6590d 100644
--- a/src/lib/datamodel/StandardAttributes.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -17,70 +17,73 @@
 
 /**
  *    @file
- *      This file contains definitions for standard CHIP Attributes
+ *      This file contains definitions for CHIP Cluster OnOff
  *
  */
 
-#ifndef CHIPSTANDARDATTRIBUTES_H_
-#define CHIPSTANDARDATTRIBUTES_H_
+#ifndef CHIPCLUSTERONOFF_H_
+#define CHIPCLUSTERONOFF_H_
 
-#include <datamodel/Attribute.h>
+#include <datamodel/Cluster.h>
 
 namespace chip {
 namespace DataModel {
 
-/* TODO: It would be nice to use a pool allocator here once we have one */
-/* Base Cluster */
-static const uint16_t kAttributeIdZCLVersion = 0x0000;
-static inline Attribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
-{
-    return new Attribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
-}
 
-static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static inline Attribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
-{
-    return new Attribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
-}
+/* Cluster ID */
+static const uint16_t kClusterIdOnOff = 0x0006;
 
-static const uint16_t kAttributeIdStackVersion = 0x0002;
-static inline Attribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
-{
-    return new Attribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
-}
+/* 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 uint16_t kAttributeIdHWVersion = 0x0003;
-static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
-{
-    return new Attribute(0x0003, ValueUInt8(HWVersion));
-}
+/* Attributes */
 
-/* On/Off Cluster */
-static const uint16_t kAttributeIdOnOff = 0x0000;
 static inline Attribute * CHIPAttributeOnOffNew(void)
 {
     return new Attribute(kAttributeIdOnOff, kCHIPValueType_Bool);
 }
 
-static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
 static inline Attribute * CHIPAttributeGlobalSceneControlNew(void)
 {
     return new Attribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
 }
 
-static const uint16_t kAttributeIdOnTime = 0x4001;
 static inline Attribute * CHIPAttributeOnTimeNew(void)
 {
     return new Attribute(0x4001, kCHIPValueType_UInt16);
 }
 
-static const uint16_t kAttributeIdOffWaitTime = 0x4002;
 static inline Attribute * CHIPAttributeOffWaitTimeNew(void)
 {
     return new Attribute(0x4002, kCHIPValueType_UInt16);
 }
 
+/* The Cluster OnOff class */
+class ClusterOnOff : public Cluster
+{
+public:
+    CHIP_ERROR Init()
+    {
+        if (mAttrs[0] == nullptr)
+        {
+            AddAttribute(CHIPAttributeOnOffNew());
+            AddAttribute(CHIPAttributeGlobalSceneControlNew());
+            AddAttribute(CHIPAttributeOnTimeNew());
+            AddAttribute(CHIPAttributeOffWaitTimeNew());
+        }
+        return CHIP_NO_ERROR;
+    }
+
+    ClusterOnOff() : Cluster(kClusterIdOnOff)
+    {
+        Init();
+    }
+};
+
 } // namespace DataModel
 } // namespace chip
 
-#endif /* CHIPSTANDARDATTRIBUTES_H_ */
+#endif /* CHIPCLUSTERONOFF_H_ */
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index e5046328f3a9b5..94bc34c9a57178 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -32,7 +32,7 @@ CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/Cluster.h           \
     @top_builddir@/src/lib/datamodel/ClusterServer.h         \
     @top_builddir@/src/lib/datamodel/EndPoint.h              \
-    @top_builddir@/src/lib/datamodel/StandardAttributes.h    \
-    @top_builddir@/src/lib/datamodel/StandardClusters.h      \
     @top_builddir@/src/lib/datamodel/Value.h                \
+    @top_builddir@/src/lib/datamodel/ClusterBasic.h    \
+    @top_builddir@/src/lib/datamodel/ClusterOnOff.h      \
     $(NULL)
diff --git a/src/lib/datamodel/EndPoint.h b/src/lib/datamodel/EndPoint.h
index f095a7e63d749e..67578351b103c2 100644
--- a/src/lib/datamodel/EndPoint.h
+++ b/src/lib/datamodel/EndPoint.h
@@ -25,7 +25,7 @@
 #define CHIPENDPOINT_H_
 
 #include <datamodel/Attribute.h>
-#include <datamodel/StandardClusters.h>
+#include <datamodel/ClusterBasic.h>
 
 namespace chip {
 namespace DataModel {

From 679cc6b9532a9bc7dde336fe0e0ec7d7b586e66d Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 9 Jul 2020 16:18:59 +0530
Subject: [PATCH 19/74] Documentation updates

---
 src/lib/datamodel/Attribute.h     | 22 +++++++++++++---------
 src/lib/datamodel/Cluster.h       | 24 ++++++++++++++++++++++++
 src/lib/datamodel/ClusterBasic.h  |  5 ++++-
 src/lib/datamodel/ClusterOnOff.h  |  5 ++++-
 src/lib/datamodel/ClusterServer.h | 23 ++++++++++++++++++++---
 src/lib/datamodel/EndPoint.h      | 17 +++++++++++++++++
 6 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/src/lib/datamodel/Attribute.h b/src/lib/datamodel/Attribute.h
index 12dec56e730291..878dcefe448ed8 100644
--- a/src/lib/datamodel/Attribute.h
+++ b/src/lib/datamodel/Attribute.h
@@ -30,6 +30,10 @@
 namespace chip {
 namespace DataModel {
 
+/**
+ * @brief
+ *   This class implements a single attribute.
+ */
 class Attribute
 {
 public:
@@ -44,16 +48,11 @@ class Attribute
         mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
     {}
 
-    /* An attribute is typically set in either of the following 2 ways:
-     *
-     * - From the top of the stack or the most derived class, like
-     *   brightness.Set(45). This is handled through the derived
-     *   class's Set method.
+    /**
+     * @brief
+     *   Set this attribute to a value
      *
-     * - From the bottom of the stack when the stack receives a schema
-     *   with just a list of values. This will typically get called
-     *   with a Set() call on the base-ptr. In this case the argument
-     *   will be Value.
+     * @param value  the new value that this attribute should be updated with
      */
     CHIP_ERROR Set(const Value & newValue)
     {
@@ -73,6 +72,11 @@ class Attribute
     /* Need to define the behaviour when Value contains pointers
      * to allocated data
      */
+    /**
+     * @brief
+     *   Get the value of this attribute
+     *
+     */
     Value Get() { return mValue; }
 
 protected:
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index aa64340b037aa3..41f9972613140b 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -31,6 +31,11 @@ namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxAttributesPerCluster = 10;
+/**
+ * @brief
+ *   This class implements the cluster object that maintains its attributes. Typically specific
+ *   cluster definitions will derive from this class and implement their functionality.
+ */
 class Cluster
 {
 public:
@@ -51,6 +56,12 @@ class Cluster
         }
     }
 
+    /**
+     * @brief
+     *   Add attributes to this cluster
+     *
+     * @param attr Pointer to the attribute object being added
+     */
     CHIP_ERROR AddAttribute(Attribute * attr)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
@@ -64,6 +75,12 @@ class Cluster
         return CHIP_ERROR_INTERNAL;
     }
 
+    /**
+     * @brief
+     *   Get pointer to the attribute object
+     *
+     * @param attrId the attribute identifer that we are looking for
+     */
     Attribute * GetAttribute(uint16_t attrId)
     {
         for (int i = 0; i < kMaxAttributesPerCluster; i++)
@@ -76,6 +93,13 @@ class Cluster
         return nullptr;
     }
 
+    /**
+     * @brief
+     *   Set an attribute to a value
+     *
+     * @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)
     {
         /* Just hand-off to update the value internally */
diff --git a/src/lib/datamodel/ClusterBasic.h b/src/lib/datamodel/ClusterBasic.h
index 6317ae6f9eaf92..41e4c9958ae083 100644
--- a/src/lib/datamodel/ClusterBasic.h
+++ b/src/lib/datamodel/ClusterBasic.h
@@ -59,7 +59,10 @@ static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
     return new Attribute(0x0003, ValueUInt8(HWVersion));
 }
 
-/* The Cluster Basic class */
+/**
+ * @brief
+ *   This class implements the Base cluster as defined in the CHIP specification.
+ */
 class ClusterBasic : public Cluster
 {
 public:
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index c84a9f27f6590d..dca015cea5c199 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -61,7 +61,10 @@ static inline Attribute * CHIPAttributeOffWaitTimeNew(void)
     return new Attribute(0x4002, kCHIPValueType_UInt16);
 }
 
-/* The Cluster OnOff class */
+/**
+ * @brief
+ *   This class implements the OnOff cluster as defined in the CHIP specification.
+ */
 class ClusterOnOff : public Cluster
 {
 public:
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index db046f261b10d0..9f89de7b226520 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -17,8 +17,8 @@
 
 /**
  *    @file
- *      This file contains the ClusterServer class. The ClusterServer
- *      maintains all the cluster servers that this devices exposes.
+ *      This file contains the Cluster Server class. The Cluster Server maintains all the cluster
+ *      servers that this devices exposes.
  *
  */
 
@@ -35,6 +35,12 @@ static const uint8_t kMaxEndPointPerServer = 5;
 /* TODO: If endpoint numbers range up to 256, it may be better not to use array index as the endpoint id */
 /* Skip the reserved endPointId */
 static const uint8_t kEndPointIdStart = 1;
+
+/**
+ * @brief
+ *   This class implements the Cluster Server that maintains all the server endpoints of this
+ *   device.
+ */
 class ClusterServer
 {
 public:
@@ -57,7 +63,12 @@ class ClusterServer
         }
     }
 
-    /* By default always add to the kEndPointIdStartth endpoint, for simplicity */
+    /**
+     * @brief
+     *   Add clusters to endpointId 1 of this Cluster Server
+     *
+     * @param cluster Pointer to the cluster object being added
+     */
     CHIP_ERROR AddCluster(Cluster * cluster)
     {
         if (!cluster)
@@ -68,6 +79,12 @@ class ClusterServer
         return mEndPoints[kEndPointIdStart]->AddCluster(cluster);
     }
 
+    /**
+     * @brief
+     *   Add a new endpoint to this Cluster Server
+     *
+     * @param cluster Pointer to the endpoint object being added
+     */
     CHIP_ERROR AddEndPoint(EndPoint * endPoint)
     {
         for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
diff --git a/src/lib/datamodel/EndPoint.h b/src/lib/datamodel/EndPoint.h
index 67578351b103c2..ec93e4a42958cf 100644
--- a/src/lib/datamodel/EndPoint.h
+++ b/src/lib/datamodel/EndPoint.h
@@ -32,6 +32,11 @@ namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
 static const uint8_t kMaxClustersPerEndPoint = 5;
+
+/**
+ * @brief
+ *   This class implements the endpoint that maintains all the clusters supported by this endpoint.
+ */
 class EndPoint
 {
 public:
@@ -57,6 +62,12 @@ class EndPoint
         }
     }
 
+    /**
+     * @brief
+     *   Add clusters to this endpoint
+     *
+     * @param cluster Pointer to the cluster object being added
+     */
     CHIP_ERROR AddCluster(Cluster * cluster)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)
@@ -70,6 +81,12 @@ class EndPoint
         return CHIP_ERROR_INTERNAL;
     }
 
+    /**
+     * @brief
+     *   Get pointer to the cluster object
+     *
+     * @param clusterId the cluster identifer that we are looking for
+     */
     Cluster * GetCluster(uint8_t clusterId)
     {
         for (int i = 0; i < kMaxClustersPerEndPoint; i++)

From 5eee74d59d6e4e600ae07b0f495c320b9e391dd0 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 9 Jul 2020 18:51:48 +0530
Subject: [PATCH 20/74] Missed the change in the test file

---
 src/lib/datamodel/tests/TestClusterServer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index edcae6b97a6890..31868f597a1243 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include <datamodel/ClusterServer.h>
+#include <datamodel/ClusterOnOff.h>
 #include <nlassert.h>
 #include <nlunit-test.h>
 #include <support/TestUtils.h>

From 725ddca76fcf73284da3b941dae24de052b5d466 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Thu, 9 Jul 2020 18:11:47 -0700
Subject: [PATCH 21/74] * add Deque.h * move from arrays to deque, no new or
 delete (yay!) * move GetValue() to be a member function of clusterserver *
 EndPoint -> Endpoint (endpoint is one word)

---
 src/lib/datamodel/Attribute.h                 |  14 +-
 src/lib/datamodel/Cluster.h                   |  43 +---
 src/lib/datamodel/ClusterBasic.h              |  59 ++----
 src/lib/datamodel/ClusterOnOff.h              |  58 ++----
 src/lib/datamodel/ClusterServer.h             |  67 +++----
 src/lib/datamodel/DataModel.am                |   4 +-
 src/lib/datamodel/Deque.h                     | 185 ++++++++++++++++++
 .../datamodel/{EndPoint.cpp => Endpoint.cpp}  |   6 +-
 src/lib/datamodel/{EndPoint.h => Endpoint.h}  |  52 ++---
 src/lib/datamodel/tests/TestClusterServer.cpp |  74 +++----
 10 files changed, 310 insertions(+), 252 deletions(-)
 create mode 100644 src/lib/datamodel/Deque.h
 rename src/lib/datamodel/{EndPoint.cpp => Endpoint.cpp} (86%)
 rename src/lib/datamodel/{EndPoint.h => Endpoint.h} (54%)

diff --git a/src/lib/datamodel/Attribute.h b/src/lib/datamodel/Attribute.h
index 878dcefe448ed8..c27923c6497d2f 100644
--- a/src/lib/datamodel/Attribute.h
+++ b/src/lib/datamodel/Attribute.h
@@ -24,9 +24,11 @@
 #ifndef CHIP_ATTRIBUTE_H_
 #define CHIP_ATTRIBUTE_H_
 
-#include <core/CHIPError.h>
+#include <datamodel/Deque.h>
 #include <datamodel/Value.h>
 
+#include <core/CHIPError.h>
+
 namespace chip {
 namespace DataModel {
 
@@ -36,16 +38,20 @@ namespace DataModel {
  */
 class Attribute
 {
+private:
+    Deque<Attribute> mDeque;
+    friend class Cluster;
+
 public:
     uint16_t mAttrId;
     Value mValue;
     Value mMin;
     Value mMax;
 
-    Attribute(uint16_t attrId, ValueTypes type) : mAttrId(attrId), mValue(type), mMin(type), mMax(type) {}
-    Attribute(uint16_t attrId, Value value) : mAttrId(attrId), mValue(value), mMin(value.mType), mMax(value.mType) {}
+    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) :
-        mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
+        mDeque(this), mAttrId(attrId), mValue(type), mMin(type, min), mMax(type, max)
     {}
 
     /**
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index 41f9972613140b..1ecd813ef6e03f 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -25,36 +25,25 @@
 #define CHIPBASECLUSTER_H_
 
 #include <datamodel/Attribute.h>
+#include <datamodel/Deque.h>
 
 namespace chip {
 namespace DataModel {
 
-/* TODO: To be converted to a template version or Kconfig later on */
-static const uint8_t kMaxAttributesPerCluster = 10;
 /**
  * @brief
  *   This class implements the cluster object that maintains its attributes. Typically specific
  *   cluster definitions will derive from this class and implement their functionality.
  */
-class Cluster
+class Cluster : public Deque<Cluster>
 {
 public:
     uint16_t mClusterId;
-    Attribute * mAttrs[kMaxAttributesPerCluster];
+    Deque<Attribute> mAttrs;
 
-    Cluster(uint16_t clusterId) : mClusterId(clusterId), mAttrs() {}
+    Cluster(uint16_t clusterId) : Deque(this), mClusterId(clusterId), mAttrs(nullptr) {}
 
-    virtual ~Cluster()
-    {
-        for (int i = 0; i < kMaxAttributesPerCluster; i++)
-        {
-            if (mAttrs[i] != nullptr)
-            {
-                delete mAttrs[i];
-                mAttrs[i] = nullptr;
-            }
-        }
-    }
+    virtual ~Cluster() {}
 
     /**
      * @brief
@@ -64,15 +53,8 @@ class Cluster
      */
     CHIP_ERROR AddAttribute(Attribute * attr)
     {
-        for (int i = 0; i < kMaxAttributesPerCluster; i++)
-        {
-            if (mAttrs[i] == nullptr)
-            {
-                mAttrs[i] = attr;
-                return CHIP_NO_ERROR;
-            }
-        }
-        return CHIP_ERROR_INTERNAL;
+        mAttrs.Insert(&attr->mDeque);
+        return CHIP_NO_ERROR;
     }
 
     /**
@@ -83,14 +65,7 @@ class Cluster
      */
     Attribute * GetAttribute(uint16_t attrId)
     {
-        for (int i = 0; i < kMaxAttributesPerCluster; i++)
-        {
-            if (mAttrs[i] && (mAttrs[i]->mAttrId == attrId))
-            {
-                return mAttrs[i];
-            }
-        }
-        return nullptr;
+        return mAttrs.Find([attrId](Attribute * item) -> bool { return (item->mAttrId == attrId); });
     }
 
     /**
@@ -104,7 +79,7 @@ class Cluster
     {
         /* Just hand-off to update the value internally */
         auto attr = GetAttribute(attrId);
-        if (attr)
+        if (attr != nullptr)
         {
             return attr->Set(value);
         }
diff --git a/src/lib/datamodel/ClusterBasic.h b/src/lib/datamodel/ClusterBasic.h
index 41e4c9958ae083..3f535d985b4d1c 100644
--- a/src/lib/datamodel/ClusterBasic.h
+++ b/src/lib/datamodel/ClusterBasic.h
@@ -33,31 +33,10 @@ namespace DataModel {
 static const uint16_t kClusterIdBase = 0x0000;
 
 /* Attribute IDs */
-static const uint16_t kAttributeIdZCLVersion = 0x0000;
+static const uint16_t kAttributeIdZCLVersion         = 0x0000;
 static const uint16_t kAttributeIdApplicationVersion = 0x0001;
-static const uint16_t kAttributeIdStackVersion = 0x0002;
-static const uint16_t kAttributeIdHWVersion = 0x0003;
-
-/* Attributes */
-static inline Attribute * CHIPAttributeZCLVersionNew(uint8_t ZCLVersion)
-{
-    return new Attribute(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion));
-}
-
-static inline Attribute * CHIPAttributeApplicationVersionNew(uint8_t applicationVersion)
-{
-    return new Attribute(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion));
-}
-
-static inline Attribute * CHIPAttributeStackVersionNew(uint8_t stackVersion)
-{
-    return new Attribute(kAttributeIdStackVersion, ValueUInt8(stackVersion));
-}
-
-static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
-{
-    return new Attribute(0x0003, ValueUInt8(HWVersion));
-}
+static const uint16_t kAttributeIdStackVersion       = 0x0002;
+static const uint16_t kAttributeIdHWVersion          = 0x0003;
 
 /**
  * @brief
@@ -65,29 +44,27 @@ static inline Attribute * CHIPAttributeHWVersionNew(uint8_t HWVersion)
  */
 class ClusterBasic : public Cluster
 {
-public:
-    ClusterBasic() : Cluster(kClusterIdBase) {}
-
-    CHIP_ERROR Init(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion)
-    {
-        if (mAttrs[0] == nullptr)
-        {
-            AddAttribute(CHIPAttributeZCLVersionNew(ZCLVersion));
-            AddAttribute(CHIPAttributeApplicationVersionNew(applicationVersion));
-            AddAttribute(CHIPAttributeStackVersionNew(stackVersion));
-            AddAttribute(CHIPAttributeHWVersionNew(HWVersion));
-        }
-        return CHIP_NO_ERROR;
-    }
+private:
+    Attribute mZCLVersion;
+    Attribute mApplicationVersion;
+    Attribute mStackVersion;
+    Attribute mHWVersion;
 
+public:
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
-        Cluster(kClusterIdBase)
+        Cluster(kClusterIdBase),
+        /* Attributes */
+        mZCLVersion(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion)),
+        mApplicationVersion(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion)),
+        mStackVersion(kAttributeIdStackVersion, ValueUInt8(stackVersion)), mHWVersion(kAttributeIdHWVersion, ValueUInt8(HWVersion))
     {
-        Init(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+        AddAttribute(&mZCLVersion);
+        AddAttribute(&mApplicationVersion);
+        AddAttribute(&mStackVersion);
+        AddAttribute(&mHWVersion);
     }
 };
 
-
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index dca015cea5c199..1d598911bf886a 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -29,37 +29,14 @@
 namespace chip {
 namespace DataModel {
 
-
 /* Cluster ID */
 static const uint16_t kClusterIdOnOff = 0x0006;
 
 /* Attribute IDs */
-static const uint16_t kAttributeIdOnOff = 0x0000;
+static const uint16_t kAttributeIdOnOff              = 0x0000;
 static const uint16_t kAttributeIdGlobalSceneControl = 0x4000;
-static const uint16_t kAttributeIdOnTime = 0x4001;
-static const uint16_t kAttributeIdOffWaitTime = 0x4002;
-
-/* Attributes */
-
-static inline Attribute * CHIPAttributeOnOffNew(void)
-{
-    return new Attribute(kAttributeIdOnOff, kCHIPValueType_Bool);
-}
-
-static inline Attribute * CHIPAttributeGlobalSceneControlNew(void)
-{
-    return new Attribute(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool);
-}
-
-static inline Attribute * CHIPAttributeOnTimeNew(void)
-{
-    return new Attribute(0x4001, kCHIPValueType_UInt16);
-}
-
-static inline Attribute * CHIPAttributeOffWaitTimeNew(void)
-{
-    return new Attribute(0x4002, kCHIPValueType_UInt16);
-}
+static const uint16_t kAttributeIdOnTime             = 0x4001;
+static const uint16_t kAttributeIdOffWaitTime        = 0x4002;
 
 /**
  * @brief
@@ -67,22 +44,23 @@ static inline Attribute * CHIPAttributeOffWaitTimeNew(void)
  */
 class ClusterOnOff : public Cluster
 {
-public:
-    CHIP_ERROR Init()
-    {
-        if (mAttrs[0] == nullptr)
-        {
-            AddAttribute(CHIPAttributeOnOffNew());
-            AddAttribute(CHIPAttributeGlobalSceneControlNew());
-            AddAttribute(CHIPAttributeOnTimeNew());
-            AddAttribute(CHIPAttributeOffWaitTimeNew());
-        }
-        return CHIP_NO_ERROR;
-    }
+    // TODO: these should
+private:
+    Attribute mOnOff;
+    Attribute mGlobalSceneControl;
+    Attribute mOnTime;
+    Attribute mOffWaitTime;
 
-    ClusterOnOff() : Cluster(kClusterIdOnOff)
+public:
+    ClusterOnOff() :
+        Cluster(kClusterIdOnOff), mOnOff(kAttributeIdOnOff, kCHIPValueType_Bool),
+        mGlobalSceneControl(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool),
+        mOnTime(kAttributeIdOnTime, kCHIPValueType_UInt16), mOffWaitTime(kAttributeIdOffWaitTime, kCHIPValueType_UInt16)
     {
-        Init();
+        AddAttribute(&mOnOff);
+        AddAttribute(&mGlobalSceneControl);
+        AddAttribute(&mOnTime);
+        AddAttribute(&mOffWaitTime);
     }
 };
 
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 9f89de7b226520..5838966f2b4524 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -25,17 +25,12 @@
 #ifndef CHIPCLUSTERSERVER_H_
 #define CHIPCLUSTERSERVER_H_
 
-#include <datamodel/EndPoint.h>
+#include <datamodel/Deque.h>
+#include <datamodel/Endpoint.h>
 
 namespace chip {
 namespace DataModel {
 
-/* TODO: To be converted to a template version or Kconfig later on */
-static const uint8_t kMaxEndPointPerServer = 5;
-/* TODO: If endpoint numbers range up to 256, it may be better not to use array index as the endpoint id */
-/* Skip the reserved endPointId */
-static const uint8_t kEndPointIdStart = 1;
-
 /**
  * @brief
  *   This class implements the Cluster Server that maintains all the server endpoints of this
@@ -44,24 +39,13 @@ static const uint8_t kEndPointIdStart = 1;
 class ClusterServer
 {
 public:
-    EndPoint * mEndPoints[kMaxEndPointPerServer];
+    Endpoint mEndpoints;
 
-    ClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mEndPoints()
-    {
-        mEndPoints[kEndPointIdStart] = new EndPoint(ZCLVersion, applicationVersion, stackVersion, HWVersion);
-    }
+    ClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
+        mEndpoints(ZCLVersion, applicationVersion, stackVersion, HWVersion)
+    {}
 
-    virtual ~ClusterServer()
-    {
-        for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
-        {
-            if (mEndPoints[i] != nullptr)
-            {
-                delete mEndPoints[i];
-                mEndPoints[i] = nullptr;
-            }
-        }
-    }
+    virtual ~ClusterServer() {}
 
     /**
      * @brief
@@ -69,15 +53,8 @@ class ClusterServer
      *
      * @param cluster Pointer to the cluster object being added
      */
-    CHIP_ERROR AddCluster(Cluster * cluster)
-    {
-        if (!cluster)
-        {
-            return CHIP_ERROR_INTERNAL;
-        }
-
-        return mEndPoints[kEndPointIdStart]->AddCluster(cluster);
-    }
+    CHIP_ERROR
+    AddCluster(Cluster * cluster) { return mEndpoints.AddCluster(cluster); }
 
     /**
      * @brief
@@ -85,14 +62,30 @@ class ClusterServer
      *
      * @param cluster Pointer to the endpoint object being added
      */
-    CHIP_ERROR AddEndPoint(EndPoint * endPoint)
+    CHIP_ERROR
+    AddEndpoint(Endpoint * endpoint)
+    {
+        mEndpoints.Insert(endpoint);
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR GetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
-        for (int i = kEndPointIdStart; i < kMaxEndPointPerServer; i++)
+        auto endpoint = mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
+
+        if (endpoint != nullptr)
         {
-            if (mEndPoints[i] == nullptr)
+            auto cluster = endpoint->GetCluster(clusterId);
+
+            if (cluster != nullptr)
             {
-                mEndPoints[i] = endPoint;
-                return CHIP_NO_ERROR;
+                auto attr = cluster->GetAttribute(attrId);
+
+                if (attr != nullptr)
+                {
+                    value = attr->mValue;
+                    return CHIP_NO_ERROR;
+                }
             }
         }
         return CHIP_ERROR_INTERNAL;
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index 94bc34c9a57178..468bcc55c37593 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -24,14 +24,14 @@
 #
 
 CHIP_BUILD_DATAMODEL_SOURCE_FILES                         = \
-    @top_builddir@/src/lib/datamodel/EndPoint.cpp       \
+    @top_builddir@/src/lib/datamodel/Endpoint.cpp       \
     $(NULL)
 
 CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/Attribute.h         \
     @top_builddir@/src/lib/datamodel/Cluster.h           \
     @top_builddir@/src/lib/datamodel/ClusterServer.h         \
-    @top_builddir@/src/lib/datamodel/EndPoint.h              \
+    @top_builddir@/src/lib/datamodel/Endpoint.h              \
     @top_builddir@/src/lib/datamodel/Value.h                \
     @top_builddir@/src/lib/datamodel/ClusterBasic.h    \
     @top_builddir@/src/lib/datamodel/ClusterOnOff.h      \
diff --git a/src/lib/datamodel/Deque.h b/src/lib/datamodel/Deque.h
new file mode 100644
index 00000000000000..0a3b93e3c9c4b4
--- /dev/null
+++ b/src/lib/datamodel/Deque.h
@@ -0,0 +1,185 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *  @file
+ *    basic double-ended queue, intended to be embedded as a member
+ *     of an object
+ */
+
+#ifndef CHIP_DEQUE_H
+#define CHIP_DEQUE_H
+
+#include <functional>
+#include <stddef.h>
+
+namespace chip {
+
+/**
+ *  @class Deque
+ *
+ *  embed-able double-ended queue item with a recovery pointer
+ *
+ */
+template <class T>
+class Deque
+{
+
+public:
+    Deque(T * me) : me(me) { mNext = mPrev = this; };
+    ~Deque() { Remove(); };
+
+    Deque * Next() { return mNext; }
+    Deque * Prev() { return mPrev; }
+    T * Me() { return me; }
+
+    void Remove()
+    {
+        mNext->mPrev = mPrev;
+        mPrev->mNext = mNext;
+        mNext = mPrev = this;
+    }
+
+    /**
+     * @brief iterate over the list, starting from
+     *     this item, until fn() returns true.  Returns
+     *     item->me of the match or NULL if no match.
+     *  Mutation of the list during fn() should be avoided
+     */
+    T * Find(std::function<bool(T *)> fn)
+    {
+        Deque * next = nullptr;
+        for (Deque * item = this; next != this; item = next)
+        {
+            next = item->mNext;
+
+            // skip any "head" node we encounter
+            if (item->me != nullptr)
+            {
+                if (fn(item->me))
+                {
+                    return item->me;
+                }
+            }
+            item = next;
+        }
+        return nullptr;
+    }
+
+    /**
+     * @brief iterate over the list, starting from
+     *     this item, until fn() returns true.  Returns
+     *     item->me of the match or NULL if no match.
+     *  Mutation of the list during fn() should be avoided
+     */
+    T * FindR(std::function<bool(T *)> fn)
+    {
+        Deque * prev = nullptr;
+        for (Deque * item = mPrev; prev != mPrev; item = prev)
+        {
+            prev = item->mPrev;
+            // skip any "head" node we encounter
+            if (item->me != nullptr)
+            {
+                if (fn(item->me))
+                {
+                    return item;
+                }
+            }
+            item = prev;
+        }
+    }
+
+    /**
+     * @brief iterate over items in the list, starting from
+     *     this item.
+     *  Mutation of the list during fn() should be avoided
+     */
+    void Foreach(std::function<void(T *)> fn)
+    {
+        Deque * next = nullptr;
+        for (Deque * item = this; next != this; item = next)
+        {
+            next = item->mNext;
+            if (item->me != nullptr)
+            {
+                fn(item->me);
+            }
+            item = next;
+        }
+    }
+
+    /**
+     * @brief iterate over items in the list, starting from
+     *    the last item
+     *  Mutation of the list during fn() should be avoided
+     */
+    void ForeachR(std::function<void(T *)> fn)
+    {
+        Deque * prev = nullptr;
+        for (Deque * item = mPrev; prev != mPrev; item = prev)
+        {
+            prev = item->mPrev;
+            if (item->me != nullptr)
+            {
+                fn(item->me);
+            }
+            item = prev;
+        }
+    }
+
+    /**
+     * @brief insert item (might be a list) as this node's
+     *   previous pointer. This is logically equivalent to
+     *   Append() or PushBack() when the subject Deque is
+     *   the head of the list.
+     *
+     * if item is a head pointer, skip the head pointer
+     */
+    void Insert(Deque * item)
+    {
+        if (item->me == nullptr)
+        {
+            if (item->mNext == item)
+            {
+                // empty list
+                return;
+            }
+
+            // pull the items off old head
+            Deque * head = item;
+
+            item = item->mNext;
+            head->Remove();
+        }
+        Deque * prev = mPrev; // save off my prev
+
+        prev->mNext  = item;        // last node's next gets item
+        mPrev        = item->mPrev; // back pointer gets end of new list
+        item->mPrev  = prev;        // item's prev gets my last node
+        mPrev->mNext = this;        // fix tail node
+    }
+
+private:
+    Deque * mNext;
+    Deque * mPrev;
+    T * me; // when null, is treated as a "head" node
+};
+
+} // namespace chip
+
+#endif /* CHIP_DEQUE */
diff --git a/src/lib/datamodel/EndPoint.cpp b/src/lib/datamodel/Endpoint.cpp
similarity index 86%
rename from src/lib/datamodel/EndPoint.cpp
rename to src/lib/datamodel/Endpoint.cpp
index b5b915e772fd1d..5fcbbb0f5dd287 100644
--- a/src/lib/datamodel/EndPoint.cpp
+++ b/src/lib/datamodel/Endpoint.cpp
@@ -17,16 +17,14 @@
 
 /**
  *    @file
- *      This file implements the EndPoint class
+ *      This file implements the Endpoint class
  *
  */
 
-#include <datamodel/EndPoint.h>
+#include <datamodel/Endpoint.h>
 
 namespace chip {
 namespace DataModel {
 
-ClusterBasic EndPoint::mBasicCluster;
-
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/datamodel/EndPoint.h b/src/lib/datamodel/Endpoint.h
similarity index 54%
rename from src/lib/datamodel/EndPoint.h
rename to src/lib/datamodel/Endpoint.h
index ec93e4a42958cf..4fe36124e76d87 100644
--- a/src/lib/datamodel/EndPoint.h
+++ b/src/lib/datamodel/Endpoint.h
@@ -17,7 +17,7 @@
 
 /**
  *    @file
- *      This file contains the EndPoint class
+ *      This file contains the Endpoint class
  *
  */
 
@@ -26,41 +26,29 @@
 
 #include <datamodel/Attribute.h>
 #include <datamodel/ClusterBasic.h>
+#include <datamodel/Deque.h>
 
 namespace chip {
 namespace DataModel {
 
 /* TODO: To be converted to a template version or Kconfig later on */
-static const uint8_t kMaxClustersPerEndPoint = 5;
+static const uint8_t kMaxClustersPerEndpoint = 5;
 
 /**
  * @brief
  *   This class implements the endpoint that maintains all the clusters supported by this endpoint.
  */
-class EndPoint
+class Endpoint : public Deque<Endpoint>
 {
+
 public:
-    static ClusterBasic mBasicCluster;
-    Cluster * mClusters[kMaxClustersPerEndPoint];
+    ClusterBasic mClusters; // head pointer is a BasicCluster
 
-    EndPoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) : mClusters()
-    {
-        mBasicCluster.Init(ZCLVersion, applicationVersion, stackVersion, HWVersion);
-        mClusters[0] = &mBasicCluster;
-    }
+    Endpoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
+        Deque(this), mClusters(ZCLVersion, applicationVersion, stackVersion, HWVersion)
+    {}
 
-    virtual ~EndPoint()
-    {
-        /* The 0th index is not dynamically allocated */
-        for (int i = 1; i < kMaxClustersPerEndPoint; i++)
-        {
-            if (mClusters[i] != nullptr)
-            {
-                delete mClusters[i];
-                mClusters[i] = nullptr;
-            }
-        }
-    }
+    virtual ~Endpoint() {}
 
     /**
      * @brief
@@ -70,15 +58,8 @@ class EndPoint
      */
     CHIP_ERROR AddCluster(Cluster * cluster)
     {
-        for (int i = 0; i < kMaxClustersPerEndPoint; i++)
-        {
-            if (mClusters[i] == nullptr)
-            {
-                mClusters[i] = cluster;
-                return CHIP_NO_ERROR;
-            }
-        }
-        return CHIP_ERROR_INTERNAL;
+        mClusters.Insert(cluster);
+        return CHIP_NO_ERROR;
     }
 
     /**
@@ -89,14 +70,7 @@ class EndPoint
      */
     Cluster * GetCluster(uint8_t clusterId)
     {
-        for (int i = 0; i < kMaxClustersPerEndPoint; i++)
-        {
-            if (mClusters[i] && mClusters[i]->mClusterId == clusterId)
-            {
-                return mClusters[i];
-            }
-        }
-        return nullptr;
+        return mClusters.Find([clusterId](Cluster * item) -> bool { return (item->mClusterId == clusterId); });
     }
 };
 
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 31868f597a1243..73edf19d9528af 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -24,8 +24,8 @@
 #define __STDC_LIMIT_MACROS
 #endif
 
-#include <datamodel/ClusterServer.h>
 #include <datamodel/ClusterOnOff.h>
+#include <datamodel/ClusterServer.h>
 #include <nlassert.h>
 #include <nlunit-test.h>
 #include <support/TestUtils.h>
@@ -34,52 +34,28 @@ using namespace ::chip::DataModel;
 
 namespace {
 
-void GetValue(ClusterServer& server, uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value &value)
-{
-    auto endpoint = server.mEndPoints[endPointId];
-    for (int j = 0; j < kMaxClustersPerEndPoint; j++)
-    {
-        /* Clusters */
-        if (endpoint->mClusters[j] && endpoint->mClusters[j]->mClusterId == clusterId)
-        {
-            auto cluster = endpoint->mClusters[j];
-            for (int k = 0; k < kMaxAttributesPerCluster; k++)
-            {
-                /* Attributes */
-                if (cluster->mAttrs[k] && cluster->mAttrs[k]->mAttrId == attrId)
-                {
-                    auto attr = cluster->mAttrs[k];
-                    value = attr->mValue;
-                }
-            }
-        }
-    }
-}
-
 void TestClusterServerBasic(nlTestSuite * inSuite, void * inContext)
 {
-    const uint8_t ZCLVersion = 10;
+    const uint8_t ZCLVersion         = 10;
     const uint8_t applicationVersion = 20;
-    const uint8_t stackVersion = 1;
-    const uint8_t HWVersion = 1;
+    const uint8_t stackVersion       = 1;
+    const uint8_t HWVersion          = 1;
     Value value;
 
     chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
 
     /* Validate attributes of the Base Cluster */
-    GetValue(server, 1, kClusterIdBase, kAttributeIdZCLVersion, value);
+    server.GetValue(1, kClusterIdBase, kAttributeIdZCLVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) != ZCLVersion);
 
-    GetValue(server, 1, kClusterIdBase, kAttributeIdApplicationVersion, value);
+    server.GetValue(1, kClusterIdBase, kAttributeIdApplicationVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == applicationVersion);
 
-    GetValue(server, 1, kClusterIdBase, kAttributeIdStackVersion, value);
+    server.GetValue(1, kClusterIdBase, kAttributeIdStackVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == stackVersion);
 
-    GetValue(server, 1, kClusterIdBase, kAttributeIdHWVersion, value);
+    server.GetValue(1, kClusterIdBase, kAttributeIdHWVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == HWVersion);
-
-
 }
 
 class testSwitch : public ClusterOnOff
@@ -87,9 +63,9 @@ class testSwitch : public ClusterOnOff
 public:
     uint8_t mGpioNum;
     bool mTestVector;
-    testSwitch(uint8_t gpio_no) : mGpioNum(gpio_no),mTestVector(false) {}
+    testSwitch(uint8_t gpio_no) : mGpioNum(gpio_no), mTestVector(false) {}
 
-    CHIP_ERROR Set(uint16_t attrId, const Value &value)
+    CHIP_ERROR Set(uint16_t attrId, const Value & value)
     {
         switch (attrId)
         {
@@ -108,37 +84,36 @@ class testSwitch : public ClusterOnOff
 
 void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
 {
-    const uint8_t ZCLVersion = 10;
+    const uint8_t ZCLVersion         = 10;
     const uint8_t applicationVersion = 20;
-    const uint8_t stackVersion = 1;
-    const uint8_t HWVersion = 1;
+    const uint8_t stackVersion       = 1;
+    const uint8_t HWVersion          = 1;
     Value value;
 
     chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
     const uint8_t switch1Gpio = 10;
-    auto *switch1 = new testSwitch(switch1Gpio);
+    auto * switch1            = new testSwitch(switch1Gpio);
     const uint8_t switch2Gpio = 11;
-    auto *switch2 = new testSwitch(switch2Gpio);
+    auto * switch2            = new testSwitch(switch2Gpio);
 
     server.AddCluster(switch1);
     server.AddCluster(switch2);
 
     /* Validate attributes of the OnOff Cluster on Endpoint 1 */
-    GetValue(server, 1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 
     /* Validate attributes of the OnOff Cluster on Endpoint 2 */
-    GetValue(server, 2, kClusterIdOnOff, kAttributeIdOnOff, value);
+    server.GetValue(2, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 
-
     /* Test that the Set() on the base class gets redirected to the correct object */
     /* Set 'true' to switch1 */
-    Cluster *cluster = switch1;
+    Cluster * cluster = switch1;
     cluster->Set(kAttributeIdOnOff, ValueBool(true));
 
     /* Test the the value in the database is updated */
-    GetValue(server, 1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
     /* Test that the appropriate function of the derived class was executed */
     NL_TEST_ASSERT(inSuite, switch1->mTestVector == true);
@@ -148,11 +123,10 @@ void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
     cluster->Set(kAttributeIdOnOff, ValueBool(true));
 
     /* Test the the value in the database is updated */
-    GetValue(server, 2, kClusterIdOnOff, kAttributeIdOnOff, value);
+    server.GetValue(2, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
     /* Test that the appropriate function of the derived class was executed */
     NL_TEST_ASSERT(inSuite, switch2->mTestVector == true);
-
 }
 
 } // namespace
@@ -162,11 +136,9 @@ int TestClusterServer(void)
     /**
      *   Test Suite. It lists all the test functions.
      */
-    static const nlTest sTests[] = {
-        NL_TEST_DEF("TestClusterServerBasic", TestClusterServerBasic),
-        NL_TEST_DEF("TestClusterServerTwoEndpoints", TestClusterServerTwoEndpoints),
-        NL_TEST_SENTINEL()
-    };
+    static const nlTest sTests[] = { NL_TEST_DEF("TestClusterServerBasic", TestClusterServerBasic),
+                                     NL_TEST_DEF("TestClusterServerTwoEndpoints", TestClusterServerTwoEndpoints),
+                                     NL_TEST_SENTINEL() };
 
     nlTestSuite theSuite = {
         "TestClusterServer", &sTests[0], NULL /* setup */, NULL /* teardown */

From 300cf243d8cccdfbaa690966331654283486915b Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Thu, 9 Jul 2020 18:51:22 -0700
Subject: [PATCH 22/74] fixups

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp | 18 ++----
 .../wifi-echo/server/esp32/main/wifi-echo.cpp | 49 +++++++---------
 src/lib/datamodel/ClusterServer.h             | 56 +++++++++++++++++++
 src/lib/datamodel/Deque.h                     | 35 ++++++------
 4 files changed, 99 insertions(+), 59 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index 9439f6af52ff22..43a7a83c7a163b 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -78,17 +78,11 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
                                                       uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
                                                       uint8_t * value)
 {
+    // At this point we can assume that value points to a boolean value.
     printf("endpoint: %d, clusterId: %d, attrId: %d type: %d\n", endpoint, clusterId, attributeId, type);
-    for (int i = 0; i < kMaxClustersPerEndPoint; i++)
-    {
-        if (server.mEndPoints[endpoint] && server.mEndPoints[endpoint]->mClusters[i] &&
-            server.mEndPoints[endpoint]->mClusters[i]->mClusterId == clusterId)
-        {
-            // At this point we can assume that value points to a boolean value.
-            Value cValue(kCHIPValueType_Bool);
-            memcpy((void *) &cValue.Int64, (void *) value, size);
-            printf("Value is %lld type is %d\n", cValue.Int64, type);
-            server.mEndPoints[endpoint]->mClusters[i]->Set(attributeId, cValue);
-        }
-    }
+    Value cValue(kCHIPValueType_Bool);
+    memcpy((void *) &cValue.Int64, (void *) value, size);
+    printf("Value is %lld type is %d\n", cValue.Int64, type);
+
+    server.SetValue(endpoint, clusterId, attributeId, cValue);
 }
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 741ae0bfed0cc8..250d2d137eab0f 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -362,36 +362,25 @@ std::string createSetupPayload()
 void PrintDataModel(ClusterServer & server)
 {
     printf("Server:\n");
-    for (int i = 0; i < kMaxEndPointPerServer; i++)
-    {
-        /* EndPoints */
-        if (server.mEndPoints[i])
-        {
-            auto endpoint = server.mEndPoints[i];
-            printf("  EndPoint: %d\n", i);
-            for (int j = 0; j < kMaxClustersPerEndPoint; j++)
-            {
-                /* Clusters */
-                if (endpoint->mClusters[j])
-                {
-                    auto cluster = endpoint->mClusters[j];
-                    printf("    ClusterId: 0x%04x\n", cluster->mClusterId);
-                    for (int k = 0; k < kMaxAttributesPerCluster; k++)
-                    {
-                        /* Attributes */
-                        if (cluster->mAttrs[k])
-                        {
-                            auto attr = cluster->mAttrs[k];
-                            printf("      Attribute: 0x%04x\n", attr->mAttrId);
-                            char printstr[20];
-                            attr->mValue.ValueToStr(printstr, sizeof(printstr));
-                            printf("              Value: %s\n", printstr);
-                        }
-                    }
-                }
-            }
-        }
-    }
+    int endpointId;
+
+    /* Endpoints */
+    server.mEndpoints.Foreach([&endpointId](Endpoint * endpoint) -> void {
+        printf("  EndPoint: %d\n", endpointId++);
+
+        /* Clusters */
+        endpoint->mClusters.Foreach([](Cluster * cluster) -> void {
+            printf("    ClusterId: 0x%04x\n", cluster->mClusterId);
+
+            /* Attributes */
+            cluster->mAttrs.Foreach([](Attribute * attr) -> void {
+                printf("      Attribute: 0x%04x\n", attr->mAttrId);
+                char printstr[20];
+                attr->mValue.ValueToStr(printstr, sizeof(printstr));
+                printf("              Value: %s\n", printstr);
+            });
+        });
+    });
 }
 
 extern "C" void app_main()
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 5838966f2b4524..0b213f965b9e21 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -69,6 +69,62 @@ class ClusterServer
         return CHIP_NO_ERROR;
     }
 
+    Endpoint * GetEndpoint(uint8_t endPointId)
+    {
+        return mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
+    }
+
+    Cluster * GetCluster(uint8_t endPointId, uint16_t clusterId)
+    {
+        Cluster * cluster = nullptr;
+
+        auto endpoint = GetEndpoint(endPointId);
+        if (endpoint != nullptr)
+        {
+            cluster = endpoint->GetCluster(clusterId);
+        }
+        return cluster;
+    }
+
+    Attribute * GetAttribute(uint8_t endPointId, uint16_t clusterId, uint16_t attrId)
+    {
+        Attribute * attr = nullptr;
+        auto endpoint    = GetEndpoint(endPointId);
+
+        if (endpoint != nullptr)
+        {
+            auto cluster = endpoint->GetCluster(clusterId);
+
+            if (cluster != nullptr)
+            {
+                attr = cluster->GetAttribute(attrId);
+            }
+        }
+        return attr;
+    }
+
+    CHIP_ERROR SetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
+    {
+        auto endpoint = GetEndpoint(endPointId-- == 0);
+
+        if (endpoint != nullptr)
+        {
+            auto cluster = endpoint->GetCluster(clusterId);
+
+            if (cluster != nullptr)
+            {
+                auto attr = cluster->GetAttribute(attrId);
+
+                if (attr != nullptr)
+                {
+                    attr->mValue = value;
+                    return CHIP_NO_ERROR;
+                }
+            }
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+
     CHIP_ERROR GetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
         auto endpoint = mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
diff --git a/src/lib/datamodel/Deque.h b/src/lib/datamodel/Deque.h
index 0a3b93e3c9c4b4..a44a97df45ae61 100644
--- a/src/lib/datamodel/Deque.h
+++ b/src/lib/datamodel/Deque.h
@@ -17,8 +17,9 @@
 
 /**
  *  @file
- *    basic double-ended queue, intended to be embedded as a member
- *     of an object
+ *    basic double-ended queue.  Two intended use models:
+ *    1. used as a raw templated type
+ *     of an object or used as a base class
  */
 
 #ifndef CHIP_DEQUE_H
@@ -40,12 +41,12 @@ class Deque
 {
 
 public:
-    Deque(T * me) : me(me) { mNext = mPrev = this; };
+    Deque(T * me) : mMe(me) { mNext = mPrev = this; };
     ~Deque() { Remove(); };
 
     Deque * Next() { return mNext; }
     Deque * Prev() { return mPrev; }
-    T * Me() { return me; }
+    T * Me() { return mMe; }
 
     void Remove()
     {
@@ -57,7 +58,7 @@ class Deque
     /**
      * @brief iterate over the list, starting from
      *     this item, until fn() returns true.  Returns
-     *     item->me of the match or NULL if no match.
+     *     item->mMe of the match or NULL if no match.
      *  Mutation of the list during fn() should be avoided
      */
     T * Find(std::function<bool(T *)> fn)
@@ -68,11 +69,11 @@ class Deque
             next = item->mNext;
 
             // skip any "head" node we encounter
-            if (item->me != nullptr)
+            if (item->mMe != nullptr)
             {
-                if (fn(item->me))
+                if (fn(item->mMe))
                 {
-                    return item->me;
+                    return item->mMe;
                 }
             }
             item = next;
@@ -83,7 +84,7 @@ class Deque
     /**
      * @brief iterate over the list, starting from
      *     this item, until fn() returns true.  Returns
-     *     item->me of the match or NULL if no match.
+     *     item->mMe of the match or NULL if no match.
      *  Mutation of the list during fn() should be avoided
      */
     T * FindR(std::function<bool(T *)> fn)
@@ -93,9 +94,9 @@ class Deque
         {
             prev = item->mPrev;
             // skip any "head" node we encounter
-            if (item->me != nullptr)
+            if (item->mMe != nullptr)
             {
-                if (fn(item->me))
+                if (fn(item->mMe))
                 {
                     return item;
                 }
@@ -115,9 +116,9 @@ class Deque
         for (Deque * item = this; next != this; item = next)
         {
             next = item->mNext;
-            if (item->me != nullptr)
+            if (item->mMe != nullptr)
             {
-                fn(item->me);
+                fn(item->mMe);
             }
             item = next;
         }
@@ -134,9 +135,9 @@ class Deque
         for (Deque * item = mPrev; prev != mPrev; item = prev)
         {
             prev = item->mPrev;
-            if (item->me != nullptr)
+            if (item->mMe != nullptr)
             {
-                fn(item->me);
+                fn(item->mMe);
             }
             item = prev;
         }
@@ -152,7 +153,7 @@ class Deque
      */
     void Insert(Deque * item)
     {
-        if (item->me == nullptr)
+        if (item->mMe == nullptr)
         {
             if (item->mNext == item)
             {
@@ -177,7 +178,7 @@ class Deque
 private:
     Deque * mNext;
     Deque * mPrev;
-    T * me; // when null, is treated as a "head" node
+    T * mMe; // when null, is treated as a "head" node
 };
 
 } // namespace chip

From 8e8e29309cb4f349f1e8b2102f57c259501e2d12 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Thu, 9 Jul 2020 19:03:14 -0700
Subject: [PATCH 23/74] add documentation

---
 src/lib/datamodel/ClusterServer.h | 56 ++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 0b213f965b9e21..38c5c77f16d98d 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -53,8 +53,7 @@ class ClusterServer
      *
      * @param cluster Pointer to the cluster object being added
      */
-    CHIP_ERROR
-    AddCluster(Cluster * cluster) { return mEndpoints.AddCluster(cluster); }
+    CHIP_ERROR AddCluster(Cluster * cluster) { return mEndpoints.AddCluster(cluster); }
 
     /**
      * @brief
@@ -62,18 +61,33 @@ class ClusterServer
      *
      * @param cluster Pointer to the endpoint object being added
      */
-    CHIP_ERROR
-    AddEndpoint(Endpoint * endpoint)
+    CHIP_ERROR AddEndpoint(Endpoint * endpoint)
     {
         mEndpoints.Insert(endpoint);
         return CHIP_NO_ERROR;
     }
 
-    Endpoint * GetEndpoint(uint8_t endPointId)
+    /**
+     * @brief
+     *   Retrieve a pointer to the corresponding Endpoint, if any
+     *
+     * @param endpointId the index of the desired Endpoint
+     * @return pointer to the Endpoint or null if not found
+     */
+    Endpoint * GetEndpoint(uint8_t endpointId)
     {
         return mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
     }
 
+    /**
+     * @brief
+     *   Retrieve a pointer to the corresponding Cluster, if any
+     *
+     * @param endpointId the index of the Endpoint with the Cluster
+     * @param clusterId the id of desired Cluster
+     *
+     * @return pointer to the Cluster or null if not found
+     */
     Cluster * GetCluster(uint8_t endPointId, uint16_t clusterId)
     {
         Cluster * cluster = nullptr;
@@ -86,6 +100,16 @@ class ClusterServer
         return cluster;
     }
 
+    /**
+     * @brief
+     *   Retrieve a pointer to the corresponding Attribute, if any
+     *
+     * @param endpointId the index of the desired Endpoint
+     * @param clusterId the id of desired Cluster
+     * @param attrId the id of desired Attribute
+     *
+     * @return pointer to the Attribute or null if not found
+     */
     Attribute * GetAttribute(uint8_t endPointId, uint16_t clusterId, uint16_t attrId)
     {
         Attribute * attr = nullptr;
@@ -103,6 +127,17 @@ class ClusterServer
         return attr;
     }
 
+    /**
+     * @brief
+     *   Find and set an Attribute's Value
+     *
+     * @param endpointId the index of the desired Endpoint
+     * @param clusterId the id of desired Cluster
+     * @param attrId the id of desired Attribute
+     * @param value the Value to set
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
     CHIP_ERROR SetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
         auto endpoint = GetEndpoint(endPointId-- == 0);
@@ -125,6 +160,17 @@ class ClusterServer
         return CHIP_ERROR_INTERNAL;
     }
 
+    /**
+     * @brief
+     *   Find and read an Attribute's Value
+     *
+     * @param endpointId the index of the desired Endpoint
+     * @param clusterId the id of desired Cluster
+     * @param attrId the id of desired Attribute
+     * @param value the Value to populate with the Attribute's value
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
     CHIP_ERROR GetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
         auto endpoint = mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });

From adfc0327b72ec1632a3423b78f7ba1fce77d45df Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 10 Jul 2020 12:24:40 +0530
Subject: [PATCH 24/74] Minor fixes

---
 .../wifi-echo/server/esp32/main/wifi-echo.cpp |  5 ++--
 src/lib/datamodel/ClusterServer.h             | 28 +++++++------------
 src/lib/datamodel/tests/TestClusterServer.cpp |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 250d2d137eab0f..be8a982f86a93e 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -362,7 +362,7 @@ std::string createSetupPayload()
 void PrintDataModel(ClusterServer & server)
 {
     printf("Server:\n");
-    int endpointId;
+    int endpointId = 1;
 
     /* Endpoints */
     server.mEndpoints.Foreach([&endpointId](Endpoint * endpoint) -> void {
@@ -429,7 +429,8 @@ extern "C" void app_main()
 
     /* Add a cluster to the primary endpoint of our cluster server */
     server.AddCluster(&statusLED);
-
+    PrintDataModel(server);
+    
     // Start the Echo Server
     InitDataModelHandler();
     startServer();
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 38c5c77f16d98d..61196ab18bda6e 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -76,7 +76,10 @@ class ClusterServer
      */
     Endpoint * GetEndpoint(uint8_t endpointId)
     {
-        return mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
+        /* Endpoint #0 is reserved, until we handle that properly, we will offset everything by 1 */
+        endpointId--;
+        auto *p = mEndpoints.Find([&endpointId](Endpoint * item) -> bool { return (endpointId-- == 0); });
+        return p;
     }
 
     /**
@@ -113,16 +116,11 @@ class ClusterServer
     Attribute * GetAttribute(uint8_t endPointId, uint16_t clusterId, uint16_t attrId)
     {
         Attribute * attr = nullptr;
-        auto endpoint    = GetEndpoint(endPointId);
 
-        if (endpoint != nullptr)
+        auto cluster = GetCluster(endPointId, clusterId);
+        if (cluster != nullptr)
         {
-            auto cluster = endpoint->GetCluster(clusterId);
-
-            if (cluster != nullptr)
-            {
-                attr = cluster->GetAttribute(attrId);
-            }
+            attr = cluster->GetAttribute(attrId);
         }
         return attr;
     }
@@ -140,7 +138,7 @@ class ClusterServer
      */
     CHIP_ERROR SetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
-        auto endpoint = GetEndpoint(endPointId-- == 0);
+        auto endpoint = GetEndpoint(endPointId);
 
         if (endpoint != nullptr)
         {
@@ -148,13 +146,7 @@ class ClusterServer
 
             if (cluster != nullptr)
             {
-                auto attr = cluster->GetAttribute(attrId);
-
-                if (attr != nullptr)
-                {
-                    attr->mValue = value;
-                    return CHIP_NO_ERROR;
-                }
+                return cluster->Set(attrId, value);
             }
         }
         return CHIP_ERROR_INTERNAL;
@@ -173,7 +165,7 @@ class ClusterServer
      */
     CHIP_ERROR GetValue(uint8_t endPointId, uint16_t clusterId, uint16_t attrId, Value & value)
     {
-        auto endpoint = mEndpoints.Find([&endPointId](Endpoint * item) -> bool { return (endPointId-- == 0); });
+        auto endpoint = GetEndpoint(endPointId);
 
         if (endpoint != nullptr)
         {
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 73edf19d9528af..34fac758f241db 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -46,7 +46,7 @@ void TestClusterServerBasic(nlTestSuite * inSuite, void * inContext)
 
     /* Validate attributes of the Base Cluster */
     server.GetValue(1, kClusterIdBase, kAttributeIdZCLVersion, value);
-    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) != ZCLVersion);
+    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == ZCLVersion);
 
     server.GetValue(1, kClusterIdBase, kAttributeIdApplicationVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == applicationVersion);

From 38ef849c40075a65a4fa5037f912fe78f1e1746c Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 10 Jul 2020 15:41:29 +0530
Subject: [PATCH 25/74] Include Dequeue.h to the build system

---
 src/lib/datamodel/DataModel.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index 468bcc55c37593..e2856c5dffdd3e 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -33,6 +33,7 @@ CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/ClusterServer.h         \
     @top_builddir@/src/lib/datamodel/Endpoint.h              \
     @top_builddir@/src/lib/datamodel/Value.h                \
+    @top_builddir@/src/lib/datamodel/Deque.h                \
     @top_builddir@/src/lib/datamodel/ClusterBasic.h    \
     @top_builddir@/src/lib/datamodel/ClusterOnOff.h      \
     $(NULL)

From bc6f68e7495a10e74545e3559c12e26b5cc5bab6 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 10 Jul 2020 16:20:15 +0530
Subject: [PATCH 26/74] Fix tests

Since the 'constructor' was in another object file, and the linker had
no pending references from TestDriver.cpp, it wasn't including the
constructor as a constructor. Added an explicit register call instead.
---
 src/lib/datamodel/tests/TestClusterServer.cpp | 2 +-
 src/lib/datamodel/tests/TestDriver.cpp        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 34fac758f241db..ae1d6278a1eaae 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -149,7 +149,7 @@ int TestClusterServer(void)
     return (nlTestRunnerStats(&theSuite));
 }
 
-static void __attribute__((constructor)) Ctor(void)
+void RegisterTests(void)
 {
     nlABORT(chip::RegisterUnitTests(&TestClusterServer) == CHIP_NO_ERROR);
 }
diff --git a/src/lib/datamodel/tests/TestDriver.cpp b/src/lib/datamodel/tests/TestDriver.cpp
index e9dac883b13f74..26675ebbbdce3e 100644
--- a/src/lib/datamodel/tests/TestDriver.cpp
+++ b/src/lib/datamodel/tests/TestDriver.cpp
@@ -27,10 +27,11 @@
 
 #include <nlunit-test.h>
 
+void RegisterTests(void);
 int main(void)
 {
     // Generate machine-readable, comma-separated value (CSV) output.
     nlTestSetOutputStyle(OUTPUT_CSV);
-
+    RegisterTests();
     return chip::RunRegisteredUnitTests();
 }

From b520ca1f71f73621782c00f94b259f6c824602f4 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Fri, 10 Jul 2020 10:19:18 +0000
Subject: [PATCH 27/74] Restyled fixes

---
 examples/wifi-echo/server/esp32/main/wifi-echo.cpp | 2 +-
 src/lib/datamodel/ClusterServer.h                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index be8a982f86a93e..69d83bd0aa8179 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -430,7 +430,7 @@ extern "C" void app_main()
     /* Add a cluster to the primary endpoint of our cluster server */
     server.AddCluster(&statusLED);
     PrintDataModel(server);
-    
+
     // Start the Echo Server
     InitDataModelHandler();
     startServer();
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 61196ab18bda6e..05ed63d4c8a863 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -78,7 +78,7 @@ class ClusterServer
     {
         /* Endpoint #0 is reserved, until we handle that properly, we will offset everything by 1 */
         endpointId--;
-        auto *p = mEndpoints.Find([&endpointId](Endpoint * item) -> bool { return (endpointId-- == 0); });
+        auto * p = mEndpoints.Find([&endpointId](Endpoint * item) -> bool { return (endpointId-- == 0); });
         return p;
     }
 

From d2178f4a532a41c7c59fd712540bec58797d3c18 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Fri, 10 Jul 2020 23:06:25 +0530
Subject: [PATCH 28/74] Add 'gn' support

---
 BUILD.gn                                      |  2 +
 src/lib/datamodel/BUILD.gn                    | 36 +++++++++++++++++
 src/lib/datamodel/tests/BUILD.gn              | 39 +++++++++++++++++++
 src/lib/datamodel/tests/Makefile.am           |  2 +-
 ...TestDriver.cpp => TestDataModelDriver.cpp} |  0
 5 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/datamodel/BUILD.gn
 create mode 100644 src/lib/datamodel/tests/BUILD.gn
 rename src/lib/datamodel/tests/{TestDriver.cpp => TestDataModelDriver.cpp} (100%)

diff --git a/BUILD.gn b/BUILD.gn
index d389987140676e..534a0b7cffa267 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -40,6 +40,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       "${chip_root}/src/inet",
       "${chip_root}/src/lib",
       "${chip_root}/src/lib/core",
+      "${chip_root}/src/lib/datamodel",
       "${chip_root}/src/lib/shell",
       "${chip_root}/src/lib/support",
       "${chip_root}/src/lwip:all",
@@ -73,6 +74,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
         "${chip_root}/src/crypto/tests",
         "${chip_root}/src/inet/tests",
         "${chip_root}/src/lib/core/tests",
+        "${chip_root}/src/lib/datamodel/tests",
         "${chip_root}/src/lib/support/tests",
         "${chip_root}/src/lwip/tests",
         "${chip_root}/src/platform/tests",
diff --git a/src/lib/datamodel/BUILD.gn b/src/lib/datamodel/BUILD.gn
new file mode 100644
index 00000000000000..68a4e321b15076
--- /dev/null
+++ b/src/lib/datamodel/BUILD.gn
@@ -0,0 +1,36 @@
+# Copyright (c) 2020 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.
+
+import("//build_overrides/chip.gni")
+
+static_library("datamodel") {
+  output_name = "libDataModel"
+
+  sources = [
+    "Attribute.h",
+    "Cluster.h",
+    "ClusterBasic.h",
+    "ClusterOnOff.h",
+    "ClusterServer.h",
+    "Deque.h",
+    "Endpoint.cpp",
+    "Endpoint.h",
+    "Value.h",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/support",
+  ]
+}
diff --git a/src/lib/datamodel/tests/BUILD.gn b/src/lib/datamodel/tests/BUILD.gn
new file mode 100644
index 00000000000000..cc5a991b5aa57d
--- /dev/null
+++ b/src/lib/datamodel/tests/BUILD.gn
@@ -0,0 +1,39 @@
+# Copyright (c) 2020 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.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/nlio.gni")
+import("//build_overrides/nlunit_test.gni")
+
+import("${chip_root}/gn/chip/chip_test_suite.gni")
+
+chip_test_suite("tests") {
+  output_name = "libDataModelTests"
+
+  sources = [
+    "TestClusterServer.cpp",
+  ]
+
+  public_deps = [
+    "${chip_root}/src/inet/tests:tests_common",
+    "${chip_root}/src/lib/datamodel",
+    "${chip_root}/src/lib/support",
+    "${nlio_root}:nlio",
+    "${nlunit_test_root}:nlunit-test",
+  ]
+
+  tests = [
+    "TestDataModel",
+  ]
+}
diff --git a/src/lib/datamodel/tests/Makefile.am b/src/lib/datamodel/tests/Makefile.am
index a69cfec349b521..a4088351590e5e 100644
--- a/src/lib/datamodel/tests/Makefile.am
+++ b/src/lib/datamodel/tests/Makefile.am
@@ -109,7 +109,7 @@ TESTS                                                 = \
 
 # Source, compiler, and linker options for test programs.
 
-TestAppLayer_SOURCES                                  = TestDriver.cpp
+TestAppLayer_SOURCES                                  = TestDataModelDriver.cpp
 TestAppLayer_LDADD                                    = $(COMMON_LDADD)
 
 #
diff --git a/src/lib/datamodel/tests/TestDriver.cpp b/src/lib/datamodel/tests/TestDataModelDriver.cpp
similarity index 100%
rename from src/lib/datamodel/tests/TestDriver.cpp
rename to src/lib/datamodel/tests/TestDataModelDriver.cpp

From f878cece8962cc32fab1a2d08768875c2a1a4c08 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sat, 11 Jul 2020 07:53:31 +0530
Subject: [PATCH 29/74] Fixes from review feedback

---
 .../server/esp32/main/EchoDeviceCallbacks.cpp |  2 --
 src/lib/datamodel/Cluster.h                   | 19 +++++++++++++++++++
 src/lib/datamodel/ClusterServer.h             | 13 +++----------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index 43a7a83c7a163b..ca446f688f0ef1 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -79,10 +79,8 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
                                                       uint8_t * value)
 {
     // At this point we can assume that value points to a boolean value.
-    printf("endpoint: %d, clusterId: %d, attrId: %d type: %d\n", endpoint, clusterId, attributeId, type);
     Value cValue(kCHIPValueType_Bool);
     memcpy((void *) &cValue.Int64, (void *) value, size);
-    printf("Value is %lld type is %d\n", cValue.Int64, type);
 
     server.SetValue(endpoint, clusterId, attributeId, cValue);
 }
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index 1ecd813ef6e03f..a6fc3d940dcfc0 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -85,6 +85,25 @@ class Cluster : public Deque<Cluster>
         }
         return CHIP_ERROR_INTERNAL;
     }
+
+    /**
+     * @brief
+     *   Get a value for an attribute
+     *
+     * @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)
+    {
+        /* Just hand-off to update the value internally */
+        auto attr = GetAttribute(attrId);
+        if (attr != nullptr)
+        {
+            value = attr->Get();
+            return CHIP_NO_ERROR;
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 05ed63d4c8a863..e062f77b9be5d7 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -76,9 +76,8 @@ class ClusterServer
      */
     Endpoint * GetEndpoint(uint8_t endpointId)
     {
-        /* Endpoint #0 is reserved, until we handle that properly, we will offset everything by 1 */
-        endpointId--;
-        auto * p = mEndpoints.Find([&endpointId](Endpoint * item) -> bool { return (endpointId-- == 0); });
+        /* Endpoint #0 is reserved, offset by 1 */
+        auto * p = mEndpoints.Find([&endpointId](Endpoint * item) -> bool { return (endpointId-- == 1); });
         return p;
     }
 
@@ -173,13 +172,7 @@ class ClusterServer
 
             if (cluster != nullptr)
             {
-                auto attr = cluster->GetAttribute(attrId);
-
-                if (attr != nullptr)
-                {
-                    value = attr->mValue;
-                    return CHIP_NO_ERROR;
-                }
+                return cluster->Get(attrId, value);
             }
         }
         return CHIP_ERROR_INTERNAL;

From 94c752504bc3d5abf617dc09191349a615783198 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Mon, 13 Jul 2020 14:32:08 -0700
Subject: [PATCH 30/74] include lib/datamodel/.. -> include datamodel/...

---
 examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp | 2 +-
 examples/wifi-echo/server/esp32/main/LEDWidget.cpp           | 2 +-
 examples/wifi-echo/server/esp32/main/include/LEDWidget.h     | 2 +-
 examples/wifi-echo/server/esp32/main/wifi-echo.cpp           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index ca446f688f0ef1..94d1e71f21afd4 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -25,7 +25,7 @@
 
 #include "EchoDeviceCallbacks.h"
 #include "esp_log.h"
-#include <lib/datamodel/ClusterServer.h>
+#include <datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 
diff --git a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
index 0540d0fbe23cc2..aef6e284162ded 100644
--- a/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
+++ b/examples/wifi-echo/server/esp32/main/LEDWidget.cpp
@@ -31,7 +31,7 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "esp_timer.h"
-#include <lib/datamodel/ClusterOnOff.h>
+#include <datamodel/ClusterOnOff.h>
 
 #if CONFIG_HAVE_DISPLAY
 // The Y position of the LED Status message on screen as a
diff --git a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
index f9e815ac390de9..6eb98d2c0c2a80 100644
--- a/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
+++ b/examples/wifi-echo/server/esp32/main/include/LEDWidget.h
@@ -27,7 +27,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/timers.h"
-#include <lib/datamodel/ClusterOnOff.h>
+#include <datamodel/ClusterOnOff.h>
 
 class LEDWidget : public chip::DataModel::ClusterOnOff
 {
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 69d83bd0aa8179..a0b133374879b7 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -42,7 +42,7 @@
 #include <vector>
 
 #include <crypto/CHIPCryptoPAL.h>
-#include <lib/datamodel/ClusterServer.h>
+#include <datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <support/ErrorStr.h>

From 087e03682836267a862b5b627d124965dfa4ba76 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 14 Jul 2020 12:58:48 +0530
Subject: [PATCH 31/74] Move the ZCLVersion/StackVersion within the SDK

---
 examples/wifi-echo/server/esp32/main/wifi-echo.cpp |  4 +---
 src/lib/datamodel/ClusterServer.h                  |  4 ++--
 src/lib/datamodel/Endpoint.h                       | 10 ++++++----
 src/lib/datamodel/tests/TestClusterServer.cpp      | 13 ++-----------
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index a0b133374879b7..c9d0d2f3eda105 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -106,11 +106,9 @@ LEDWidget statusLED;
 const char * TAG = "wifi-echo-demo";
 
 static EchoDeviceCallbacks EchoCallbacks;
-const uint8_t ZCLVersion         = 10;
 const uint8_t applicationVersion = 20;
-const uint8_t stackVersion       = 1;
 const uint8_t HWVersion          = 1;
-ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+ClusterServer server(applicationVersion, HWVersion);
 
 namespace {
 
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index e062f77b9be5d7..cecdca8868b478 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -41,8 +41,8 @@ class ClusterServer
 public:
     Endpoint mEndpoints;
 
-    ClusterServer(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
-        mEndpoints(ZCLVersion, applicationVersion, stackVersion, HWVersion)
+    ClusterServer(uint8_t applicationVersion, uint8_t HWVersion) :
+        mEndpoints(applicationVersion, HWVersion)
     {}
 
     virtual ~ClusterServer() {}
diff --git a/src/lib/datamodel/Endpoint.h b/src/lib/datamodel/Endpoint.h
index 4fe36124e76d87..da39b6bb2b6db6 100644
--- a/src/lib/datamodel/Endpoint.h
+++ b/src/lib/datamodel/Endpoint.h
@@ -31,8 +31,10 @@
 namespace chip {
 namespace DataModel {
 
-/* TODO: To be converted to a template version or Kconfig later on */
-static const uint8_t kMaxClustersPerEndpoint = 5;
+/* The ZCL/CHIP Version that is supported - this is arbitrary for now */
+static const uint8_t kZCLVersion = 5;
+/* The current stack version */
+static const uint8_t kstackVersion = 10;
 
 /**
  * @brief
@@ -44,8 +46,8 @@ class Endpoint : public Deque<Endpoint>
 public:
     ClusterBasic mClusters; // head pointer is a BasicCluster
 
-    Endpoint(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
-        Deque(this), mClusters(ZCLVersion, applicationVersion, stackVersion, HWVersion)
+    Endpoint(uint8_t applicationVersion, uint8_t HWVersion) :
+        Deque(this), mClusters(kZCLVersion, applicationVersion, kstackVersion, HWVersion)
     {}
 
     virtual ~Endpoint() {}
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index ae1d6278a1eaae..5d7c78bebcfa7a 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -36,24 +36,17 @@ namespace {
 
 void TestClusterServerBasic(nlTestSuite * inSuite, void * inContext)
 {
-    const uint8_t ZCLVersion         = 10;
     const uint8_t applicationVersion = 20;
-    const uint8_t stackVersion       = 1;
     const uint8_t HWVersion          = 1;
     Value value;
 
-    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    chip::DataModel::ClusterServer server(applicationVersion, HWVersion);
 
     /* Validate attributes of the Base Cluster */
-    server.GetValue(1, kClusterIdBase, kAttributeIdZCLVersion, value);
-    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == ZCLVersion);
 
     server.GetValue(1, kClusterIdBase, kAttributeIdApplicationVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == applicationVersion);
 
-    server.GetValue(1, kClusterIdBase, kAttributeIdStackVersion, value);
-    NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == stackVersion);
-
     server.GetValue(1, kClusterIdBase, kAttributeIdHWVersion, value);
     NL_TEST_ASSERT(inSuite, ValueToUInt8(value) == HWVersion);
 }
@@ -84,13 +77,11 @@ class testSwitch : public ClusterOnOff
 
 void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
 {
-    const uint8_t ZCLVersion         = 10;
     const uint8_t applicationVersion = 20;
-    const uint8_t stackVersion       = 1;
     const uint8_t HWVersion          = 1;
     Value value;
 
-    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    chip::DataModel::ClusterServer server(applicationVersion, HWVersion);
     const uint8_t switch1Gpio = 10;
     auto * switch1            = new testSwitch(switch1Gpio);
     const uint8_t switch2Gpio = 11;

From 8a84cfb3672c89a48a4fe06cb745f61750e04945 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 14 Jul 2020 13:53:28 +0530
Subject: [PATCH 32/74] restyle

---
 src/lib/datamodel/ClusterServer.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index cecdca8868b478..544c8dd32e4443 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -41,9 +41,7 @@ class ClusterServer
 public:
     Endpoint mEndpoints;
 
-    ClusterServer(uint8_t applicationVersion, uint8_t HWVersion) :
-        mEndpoints(applicationVersion, HWVersion)
-    {}
+    ClusterServer(uint8_t applicationVersion, uint8_t HWVersion) : mEndpoints(applicationVersion, HWVersion) {}
 
     virtual ~ClusterServer() {}
 

From 3e390b82b50fd11d150957b06561861a5f6eb904 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Wed, 15 Jul 2020 14:35:00 -0700
Subject: [PATCH 33/74] functor instead of std::function

---
 src/lib/datamodel/Deque.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lib/datamodel/Deque.h b/src/lib/datamodel/Deque.h
index a44a97df45ae61..e2d5300e11cacc 100644
--- a/src/lib/datamodel/Deque.h
+++ b/src/lib/datamodel/Deque.h
@@ -61,7 +61,8 @@ class Deque
      *     item->mMe of the match or NULL if no match.
      *  Mutation of the list during fn() should be avoided
      */
-    T * Find(std::function<bool(T *)> fn)
+    template <typename Functor>
+    T * Find(Functor fn)
     {
         Deque * next = nullptr;
         for (Deque * item = this; next != this; item = next)
@@ -87,7 +88,8 @@ class Deque
      *     item->mMe of the match or NULL if no match.
      *  Mutation of the list during fn() should be avoided
      */
-    T * FindR(std::function<bool(T *)> fn)
+    template <typename Functor>
+    T * FindR(Functor fn)
     {
         Deque * prev = nullptr;
         for (Deque * item = mPrev; prev != mPrev; item = prev)
@@ -110,7 +112,8 @@ class Deque
      *     this item.
      *  Mutation of the list during fn() should be avoided
      */
-    void Foreach(std::function<void(T *)> fn)
+    template <typename Functor>
+    void Foreach(Functor fn)
     {
         Deque * next = nullptr;
         for (Deque * item = this; next != this; item = next)
@@ -129,7 +132,8 @@ class Deque
      *    the last item
      *  Mutation of the list during fn() should be avoided
      */
-    void ForeachR(std::function<void(T *)> fn)
+    template <typename Functor>
+    void ForeachR(Functor fn)
     {
         Deque * prev = nullptr;
         for (Deque * item = mPrev; prev != mPrev; item = prev)

From 4901e0656709368010d00ae491ff1d983ba0b2af Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 19 Jul 2020 16:01:34 +0530
Subject: [PATCH 34/74] Use 'g' prefix for globals

---
 .../wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp     | 4 ++--
 examples/wifi-echo/server/esp32/main/wifi-echo.cpp          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index 94d1e71f21afd4..a7fc7d89bd268f 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -72,7 +72,7 @@ void EchoDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, int
     }
 }
 
-extern ClusterServer server;
+extern ClusterServer gServer;
 /* This function can be eliminated, and instead its contents will get executed */
 void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
                                                       uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
@@ -82,5 +82,5 @@ void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclC
     Value cValue(kCHIPValueType_Bool);
     memcpy((void *) &cValue.Int64, (void *) value, size);
 
-    server.SetValue(endpoint, clusterId, attributeId, cValue);
+    gServer.SetValue(endpoint, clusterId, attributeId, cValue);
 }
diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index c9d0d2f3eda105..8db2c1cba7219e 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -108,7 +108,7 @@ const char * TAG = "wifi-echo-demo";
 static EchoDeviceCallbacks EchoCallbacks;
 const uint8_t applicationVersion = 20;
 const uint8_t HWVersion          = 1;
-ClusterServer server(applicationVersion, HWVersion);
+ClusterServer gServer(applicationVersion, HWVersion);
 
 namespace {
 
@@ -426,8 +426,8 @@ extern "C" void app_main()
     statusLED.Init(STATUS_LED_GPIO_NUM);
 
     /* Add a cluster to the primary endpoint of our cluster server */
-    server.AddCluster(&statusLED);
-    PrintDataModel(server);
+    gServer.AddCluster(&statusLED);
+    PrintDataModel(gServer);
 
     // Start the Echo Server
     InitDataModelHandler();

From 41fe827c0a804fb0712855247c7a6aa1c6555e89 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 19 Jul 2020 16:09:34 +0530
Subject: [PATCH 35/74] Introduce ClusterId_t and AttributeId_t

---
 src/lib/datamodel/Attribute.h    | 11 +++++++----
 src/lib/datamodel/Cluster.h      | 11 ++++++-----
 src/lib/datamodel/ClusterBasic.h | 10 +++++-----
 src/lib/datamodel/ClusterOnOff.h | 10 +++++-----
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/lib/datamodel/Attribute.h b/src/lib/datamodel/Attribute.h
index c27923c6497d2f..05a02aa0b60d5f 100644
--- a/src/lib/datamodel/Attribute.h
+++ b/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)
     {}
 
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index a6fc3d940dcfc0..c412d11e00b285 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/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);
diff --git a/src/lib/datamodel/ClusterBasic.h b/src/lib/datamodel/ClusterBasic.h
index 3f535d985b4d1c..af0c1656437950 100644
--- a/src/lib/datamodel/ClusterBasic.h
+++ b/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
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 1d598911bf886a..63e07906834e80 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/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

From f42189de0d4a6aa794b98d22d95086607ac23998 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 21 Jul 2020 13:58:24 +0530
Subject: [PATCH 36/74] Don't embed 'enum' or min/max in the Attribute class

---
 .../wifi-echo/server/esp32/main/wifi-echo.cpp |  2 +-
 src/lib/datamodel/Attribute.h                 | 89 +++++++++----------
 src/lib/datamodel/ClusterBasic.h              | 13 ++-
 src/lib/datamodel/ClusterOnOff.h              | 13 ++-
 src/lib/datamodel/Value.h                     | 62 +++++++++++++
 5 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
index 8db2c1cba7219e..e7f1710da29f01 100644
--- a/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
+++ b/examples/wifi-echo/server/esp32/main/wifi-echo.cpp
@@ -374,7 +374,7 @@ void PrintDataModel(ClusterServer & server)
             cluster->mAttrs.Foreach([](Attribute * attr) -> void {
                 printf("      Attribute: 0x%04x\n", attr->mAttrId);
                 char printstr[20];
-                attr->mValue.ValueToStr(printstr, sizeof(printstr));
+                attr->Get().ValueToStr(printstr, sizeof(printstr));
                 printf("              Value: %s\n", printstr);
             });
         });
diff --git a/src/lib/datamodel/Attribute.h b/src/lib/datamodel/Attribute.h
index 05a02aa0b60d5f..3097419d38341a 100644
--- a/src/lib/datamodel/Attribute.h
+++ b/src/lib/datamodel/Attribute.h
@@ -17,7 +17,7 @@
 
 /**
  *    @file
- *      This file contains definitions for working with CHIP values.
+ *      This file contains definitions for working with CHIP Attributes
  *
  */
 
@@ -45,17 +45,8 @@ class Attribute
 
 public:
     AttributeId_t mAttrId;
-    Value mValue;
-    Value mMin;
-    Value mMax;
-
-    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)
-    {}
+
+    Attribute(AttributeId_t attrId) : mDeque(this), mAttrId(attrId) {}
 
     /**
      * @brief
@@ -63,20 +54,7 @@ class Attribute
      *
      * @param value  the new value that this attribute should be updated with
      */
-    CHIP_ERROR Set(const Value & newValue)
-    {
-        /* We have to check the element type match in this case */
-        if (mValue.mType != newValue.mType)
-        {
-            return CHIP_ERROR_INTERNAL;
-        }
-        if (withinRange(newValue))
-        {
-            mValue = newValue;
-            return CHIP_NO_ERROR;
-        }
-        return CHIP_ERROR_INTERNAL;
-    }
+    virtual CHIP_ERROR Set(const Value & newValue) = 0;
 
     /* Need to define the behaviour when Value contains pointers
      * to allocated data
@@ -86,32 +64,51 @@ class Attribute
      *   Get the value of this attribute
      *
      */
-    Value Get() { return mValue; }
+    virtual Value Get(void) = 0;
+};
 
-protected:
-    bool withinRange(const uint64_t & value) { return (value >= mMin.Int64) && (value <= mMax.Int64); }
+template <typename ValueType>
+class AttributeSimple : public Attribute
+{
+private:
+    ValueType mValue;
 
-    bool withinRange(const Value value)
+public:
+    AttributeSimple(AttributeId_t attrId) : Attribute(attrId) {}
+    AttributeSimple(AttributeId_t attrId, ValueType value) : Attribute(attrId), mValue(value) {}
+
+    CHIP_ERROR Set(const Value & newValue) { return ValueToType(newValue, mValue); }
+
+    Value Get(void) { return TypeToValue(mValue); }
+};
+
+template <typename ValueType, ValueType min, ValueType max>
+class AttributeWithRange : public Attribute
+{
+private:
+    ValueType mValue;
+    const ValueType mMin = min;
+    const ValueType mMax = max;
+
+public:
+    AttributeWithRange(AttributeId_t attrId) : Attribute(attrId) {}
+    AttributeWithRange(AttributeId_t attrId, ValueType value) : Attribute(attrId), mValue(value) {}
+
+    CHIP_ERROR Set(const Value & newValue)
     {
-        switch (mValue.mType)
+        ValueType tmp;
+        if (ValueToType(newValue, tmp) == CHIP_NO_ERROR)
         {
-        case kCHIPValueType_Int8:
-        case kCHIPValueType_Int16:
-        case kCHIPValueType_Int32:
-        case kCHIPValueType_Int64:
-        case kCHIPValueType_UInt8:
-        case kCHIPValueType_UInt16:
-        case kCHIPValueType_UInt32:
-        case kCHIPValueType_UInt64:
-            return withinRange(value.Int64);
-            break;
-        case kCHIPValueType_Bool:
-            return true;
-        default:
-            return false;
+            if ((tmp >= mMin) && (tmp <= mMax))
+            {
+                mValue = tmp;
+                return CHIP_NO_ERROR;
+            }
         }
-        return false;
+        return CHIP_ERROR_INTERNAL;
     }
+
+    Value Get(void) { return TypeToValue(mValue); }
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/ClusterBasic.h b/src/lib/datamodel/ClusterBasic.h
index af0c1656437950..dc9b7a28cad499 100644
--- a/src/lib/datamodel/ClusterBasic.h
+++ b/src/lib/datamodel/ClusterBasic.h
@@ -45,18 +45,17 @@ static const AttributeId_t kAttributeIdHWVersion          = 0x0003;
 class ClusterBasic : public Cluster
 {
 private:
-    Attribute mZCLVersion;
-    Attribute mApplicationVersion;
-    Attribute mStackVersion;
-    Attribute mHWVersion;
+    AttributeSimple<uint8_t> mZCLVersion;
+    AttributeSimple<uint8_t> mApplicationVersion;
+    AttributeSimple<uint8_t> mStackVersion;
+    AttributeSimple<uint8_t> mHWVersion;
 
 public:
     ClusterBasic(uint8_t ZCLVersion, uint8_t applicationVersion, uint8_t stackVersion, uint8_t HWVersion) :
         Cluster(kClusterIdBase),
         /* Attributes */
-        mZCLVersion(kAttributeIdZCLVersion, ValueUInt8(ZCLVersion)),
-        mApplicationVersion(kAttributeIdApplicationVersion, ValueUInt8(applicationVersion)),
-        mStackVersion(kAttributeIdStackVersion, ValueUInt8(stackVersion)), mHWVersion(kAttributeIdHWVersion, ValueUInt8(HWVersion))
+        mZCLVersion(kAttributeIdZCLVersion, ZCLVersion), mApplicationVersion(kAttributeIdApplicationVersion, applicationVersion),
+        mStackVersion(kAttributeIdStackVersion, stackVersion), mHWVersion(kAttributeIdHWVersion, HWVersion)
     {
         AddAttribute(&mZCLVersion);
         AddAttribute(&mApplicationVersion);
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 63e07906834e80..885ef3ccfcbda9 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -46,16 +46,15 @@ class ClusterOnOff : public Cluster
 {
     // TODO: these should
 private:
-    Attribute mOnOff;
-    Attribute mGlobalSceneControl;
-    Attribute mOnTime;
-    Attribute mOffWaitTime;
+    AttributeSimple<bool> mOnOff;
+    AttributeSimple<bool> mGlobalSceneControl;
+    AttributeSimple<uint16_t> mOnTime;
+    AttributeSimple<uint16_t> mOffWaitTime;
 
 public:
     ClusterOnOff() :
-        Cluster(kClusterIdOnOff), mOnOff(kAttributeIdOnOff, kCHIPValueType_Bool),
-        mGlobalSceneControl(kAttributeIdGlobalSceneControl, kCHIPValueType_Bool),
-        mOnTime(kAttributeIdOnTime, kCHIPValueType_UInt16), mOffWaitTime(kAttributeIdOffWaitTime, kCHIPValueType_UInt16)
+        Cluster(kClusterIdOnOff), mOnOff(kAttributeIdOnOff), mGlobalSceneControl(kAttributeIdGlobalSceneControl),
+        mOnTime(kAttributeIdOnTime), mOffWaitTime(kAttributeIdOffWaitTime)
     {
         AddAttribute(&mOnOff);
         AddAttribute(&mGlobalSceneControl);
diff --git a/src/lib/datamodel/Value.h b/src/lib/datamodel/Value.h
index 35137bf1d2abcb..bc5cd8889ad6b8 100644
--- a/src/lib/datamodel/Value.h
+++ b/src/lib/datamodel/Value.h
@@ -24,6 +24,7 @@
 #ifndef CHIP_VALUE_H_
 #define CHIP_VALUE_H_
 
+#include <core/CHIPError.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -117,6 +118,67 @@ static inline uint8_t ValueToUInt8(Value v)
     return (uint8_t) v.Int64;
 }
 
+/* TODO: Once we use this, I don't think we will need the above convenience API */
+static inline Value TypeToValue(bool b)
+{
+    return Value(kCHIPValueType_Bool, (uint64_t) b);
+}
+
+static inline Value TypeToValue(uint8_t i)
+{
+    return Value(kCHIPValueType_UInt8, (uint64_t) i);
+}
+
+static inline Value TypeToValue(uint16_t i)
+{
+    return Value(kCHIPValueType_UInt16, (uint64_t) i);
+}
+
+static inline Value TypeToValue(uint32_t i)
+{
+    return Value(kCHIPValueType_UInt32, (uint64_t) i);
+}
+
+static inline CHIP_ERROR ValueToType(Value v, bool & b)
+{
+    if (v.mType == kCHIPValueType_Bool)
+    {
+        b = (bool) v.Int64;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_INTERNAL;
+}
+
+static inline CHIP_ERROR ValueToType(Value v, uint8_t & i)
+{
+    if (v.mType == kCHIPValueType_UInt8)
+    {
+        i = (uint8_t) v.Int64;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_INTERNAL;
+}
+
+static inline CHIP_ERROR ValueToType(Value v, uint16_t & i)
+{
+    if (v.mType == kCHIPValueType_UInt16)
+    {
+        i = (uint16_t) v.Int64;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_INTERNAL;
+}
+
+static inline CHIP_ERROR ValueToType(Value v, uint32_t & i)
+{
+    if (v.mType == kCHIPValueType_UInt32)
+    {
+        i = (uint32_t) v.Int64;
+        return CHIP_NO_ERROR;
+    }
+    return CHIP_ERROR_INTERNAL;
+}
+
 } // namespace DataModel
 } // namespace chip
 

From fc06418bcb56b65516a8ad215fa92468951909af Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Fri, 10 Jul 2020 14:06:06 -0400
Subject: [PATCH 37/74] Fix GN build warnings due to objects with no symbols on
 Mac (#1552)

Add support for selecting one of CHIPMem-Malloc.cpp and
CHIPMem-Simple.cpp to avoid warnings from compiling files with no
symbols.
---
 src/lib/core/BUILD.gn    | 20 ++++++++++++++++++++
 src/lib/core/core.gni    |  9 +++++++++
 src/lib/support/BUILD.gn |  9 +++++++--
 src/system/BUILD.gn      |  5 -----
 src/system/system.gni    |  6 ------
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
index 0d9d6c8830865b..b6e1cf7b1958c3 100644
--- a/src/lib/core/BUILD.gn
+++ b/src/lib/core/BUILD.gn
@@ -89,6 +89,26 @@ config("chip_config") {
     defines += [ "CHIP_LOGGING_STYLE_STDIO_WEAK=0" ]
   }
 
+  if (chip_config_memory_management == "malloc") {
+    defines += [
+      "CHIP_CONFIG_MEMORY_MGMT_MALLOC=1",
+      "HAVE_MALLOC=1",
+      "HAVE_FREE=1",
+    ]
+  } else {
+    defines += [ "CHIP_CONFIG_MEMORY_MGMT_MALLOC=0" ]
+  }
+  if (chip_config_memory_management == "simple") {
+    defines += [ "CHIP_CONFIG_MEMORY_MGMT_SIMPLE=1" ]
+  } else {
+    defines += [ "CHIP_CONFIG_MEMORY_MGMT_SIMPLE=0" ]
+  }
+  if (chip_config_memory_management == "platform") {
+    defines += [ "CHIP_CONFIG_MEMORY_MGMT_PLATFORM=1" ]
+  } else {
+    defines += [ "CHIP_CONFIG_MEMORY_MGMT_PLATFORM=0" ]
+  }
+
   include_dirs = [ target_gen_dir ]
 
   configs = [
diff --git a/src/lib/core/core.gni b/src/lib/core/core.gni
index 0fa97c99e2e57a..81169b272f1c68 100644
--- a/src/lib/core/core.gni
+++ b/src/lib/core/core.gni
@@ -38,6 +38,9 @@ declare_args() {
 
   # Enable argument parser.
   chip_config_enable_arg_parser = true
+
+  # Memory management style: malloc, simple, platform.
+  chip_config_memory_management = "malloc"
 }
 
 if (chip_target_style == "") {
@@ -63,3 +66,9 @@ assert(
     chip_logging_style == "android" || chip_logging_style == "external" ||
         chip_logging_style == "stdio" || chip_logging_style == "stdio_weak",
     "Please select a valid logging style: android, external, stdio, stdio_weak")
+
+assert(
+    chip_config_memory_management == "malloc" ||
+        chip_config_memory_management == "simple" ||
+        chip_config_memory_management == "platform",
+    "Please select a valid memory management style: malloc, simple, platform")
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 5d5d366ca7a8f6..f46e9903ac6829 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -19,6 +19,7 @@ import("//build_overrides/nlio.gni")
 
 import("${chip_root}/gn/chip/chip_version.gni")
 import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/src/lib/core/core.gni")
 
 action("gen_chip_version") {
   script = "${chip_root}/scripts/gen_chip_version.py"
@@ -73,8 +74,6 @@ static_library("support") {
     "Base64.cpp",
     "CHIPArgParser.cpp",
     "CHIPCounter.cpp",
-    "CHIPMem-Malloc.cpp",
-    "CHIPMem-SimpleAlloc.cpp",
     "ErrorStr.cpp",
     "FibonacciUtils.cpp",
     "PersistedCounter.cpp",
@@ -101,6 +100,12 @@ static_library("support") {
 
   public_configs = [ ":support_config" ]
 
+  if (chip_config_memory_management == "simple") {
+    sources += [ "CHIPMem-SimpleAlloc.cpp" ]
+  }
+  if (chip_config_memory_management == "malloc") {
+    sources += [ "CHIPMem-Malloc.cpp" ]
+  }
   if (chip_with_nlfaultinjection) {
     sources += [ "CHIPFaultInjection.cpp" ]
     public += [ "CHIPFaultInjection.h" ]
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index 41ef7c19128e9a..d22598e1d8dc68 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -97,11 +97,6 @@ config("system_config") {
   } else {
     defines += [ "CHIP_SYSTEM_CONFIG_PROVIDE_STATISTICS=0" ]
   }
-  if (chip_system_config_use_malloc) {
-    defines += [ "CONFIG_HAVE_HEAP=1" ]
-    defines += [ "HAVE_MALLOC=1" ]
-    defines += [ "HAVE_FREE=1" ]
-  }
   if (chip_system_config_clock == "clock_gettime") {
     defines += [ "HAVE_CLOCK_GETTIME=1" ]
     defines += [ "HAVE_CLOCK_SETTIME=1" ]
diff --git a/src/system/system.gni b/src/system/system.gni
index 532390bd43a6b8..63a4cee04134ec 100644
--- a/src/system/system.gni
+++ b/src/system/system.gni
@@ -13,12 +13,6 @@
 # limitations under the License.
 
 declare_args() {
-  # Build tests.
-  chip_system_config_test = true
-
-  # Use malloc.
-  chip_system_config_use_malloc = current_os != "freertos"
-
   # Use the lwIP library.
   chip_system_config_use_lwip = current_os == "freertos"
 

From 5b26501b158263c26ac79bbb55b55587fa96fb0e Mon Sep 17 00:00:00 2001
From: Martin Turon <mturon@google.com>
Date: Fri, 10 Jul 2020 12:36:07 -0700
Subject: [PATCH 38/74] [gn] Vscode integration. Fixes #1526. (#1527)

* [gn] Vscode integration. Fixes #1526.

* [gn] Fix merge conflict.
---
 .vscode/tasks.json | 15 +++++++++++++++
 gn_build.sh        | 35 +++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0cd88daedb8a84..3b1154935e33b5 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -17,6 +17,21 @@
             },
             "problemMatcher": ["$gcc"]
         },
+        {
+            "label": "GN Build",
+            "type": "shell",
+            "command": "./gn_build.sh",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "isBackground": false,
+            "presentation": {
+                "reveal": "always",
+                "panel": "shared"
+            },
+            "problemMatcher": ["$gcc"]
+        },
         {
             "label": "Auto-enforce coding style",
             "type": "shell",
diff --git a/gn_build.sh b/gn_build.sh
index 77440d2a7dd20c..9aa9e9d5609db5 100755
--- a/gn_build.sh
+++ b/gn_build.sh
@@ -40,22 +40,7 @@ set +e
 source "$CHIP_ROOT/scripts/activate.sh"
 set -e
 
-_chip_banner "Build: GN configure"
-
-nrf5_sdk_args=""
-extra_args=""
-
-if [[ -d "$NRF5_SDK_ROOT/components/libraries" ]]; then
-    nrf5_sdk_args+="nrf5_sdk_root=\"$NRF5_SDK_ROOT\""
-    extra_args+=" $nrf5_sdk_args enable_nrf5_builds=true"
-fi
-
-gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args"
-gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/release" --args='target_os="all" is_debug=false'"$extra_args"
-
-_chip_banner "Build: Ninja build"
-
-time ninja -C "$CHIP_ROOT/out/debug" all check
+_chip_banner "Instructions"
 
 echo
 echo 'To activate existing build environment in your shell, run (do this first):'
@@ -91,3 +76,21 @@ else
     echo 'To build the nRF5 lock sample as a standalone project':
     echo "(cd $CHIP_ROOT/examples/lock-app/nrf5; gn gen out/debug --args='$nrf5_sdk_args'; ninja -C out/debug)"
 fi
+echo
+
+_chip_banner "Build: GN configure"
+
+nrf5_sdk_args=""
+extra_args=""
+
+if [[ -d "$NRF5_SDK_ROOT/components/libraries" ]]; then
+    nrf5_sdk_args+="nrf5_sdk_root=\"$NRF5_SDK_ROOT\""
+    extra_args+=" $nrf5_sdk_args enable_nrf5_builds=true"
+fi
+
+gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args"
+gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/release" --args='target_os="all" is_debug=false'"$extra_args"
+
+_chip_banner "Build: Ninja build"
+
+time ninja -C "$CHIP_ROOT/out/debug" all check

From 3a784e33dfb71d310e038a5dff091bd4a5a0b6a4 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andrei@andy314.com>
Date: Fri, 10 Jul 2020 15:36:50 -0400
Subject: [PATCH 39/74] Bloat check scheduling: update timing to 5 minutes,
 checkout code since scripts are in the code (#1556)

* Run the bloat check script as a scheduled github workflow.

Should generate bloat reports on any pull requests.

* Bloat script requires checkout. Also updated latest build image

* Run bloat check more frequently
---
 .github/workflows/bloat_check.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
index b60b0c4a6309ca..94e790233a1179 100644
--- a/.github/workflows/bloat_check.yaml
+++ b/.github/workflows/bloat_check.yaml
@@ -1,7 +1,7 @@
 name: Bloat Check
 on:
     schedule:
-        - cron: '*/10 * * * *'
+        - cron: '*/5 * * * *'
 
 
 jobs:
@@ -11,9 +11,12 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: "connectedhomeip/chip-build-openssl:0.2.18"
+            image: connectedhomeip/chip-build:0.3.0
 
         steps:
+            - name: Checkout
+              uses: actions/checkout@v2
+
             - name: Report
               run: |
                   scripts/helpers/bloat_check.py                        \

From 651634db36735f39558c2800b632bce1a0f3f17d Mon Sep 17 00:00:00 2001
From: Marc Lepage <67919234+mlepage-google@users.noreply.github.com>
Date: Fri, 10 Jul 2020 16:50:11 -0400
Subject: [PATCH 40/74] Move screen framework into component (#1555)

---
 .../screen-framework}/Display.cpp             |  0
 .../screen-framework}/ListScreen.cpp          |  0
 .../screen-framework/README.md}               |  0
 .../screen-framework}/Screen.cpp              |  0
 .../screen-framework}/ScreenManager.cpp       |  0
 examples/common/screen-framework/component.mk | 24 +++++++++++++++++++
 .../screen-framework}/include/Display.h       |  0
 .../screen-framework}/include/ListScreen.h    |  0
 .../screen-framework}/include/Screen.h        |  0
 .../screen-framework}/include/ScreenManager.h |  0
 examples/wifi-echo/server/esp32/Makefile      |  1 +
 11 files changed, 25 insertions(+)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/Display.cpp (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/ListScreen.cpp (100%)
 rename examples/{wifi-echo/server/esp32/README.screen.md => common/screen-framework/README.md} (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/Screen.cpp (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/ScreenManager.cpp (100%)
 create mode 100644 examples/common/screen-framework/component.mk
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/include/Display.h (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/include/ListScreen.h (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/include/Screen.h (100%)
 rename examples/{wifi-echo/server/esp32/main => common/screen-framework}/include/ScreenManager.h (100%)

diff --git a/examples/wifi-echo/server/esp32/main/Display.cpp b/examples/common/screen-framework/Display.cpp
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/Display.cpp
rename to examples/common/screen-framework/Display.cpp
diff --git a/examples/wifi-echo/server/esp32/main/ListScreen.cpp b/examples/common/screen-framework/ListScreen.cpp
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/ListScreen.cpp
rename to examples/common/screen-framework/ListScreen.cpp
diff --git a/examples/wifi-echo/server/esp32/README.screen.md b/examples/common/screen-framework/README.md
similarity index 100%
rename from examples/wifi-echo/server/esp32/README.screen.md
rename to examples/common/screen-framework/README.md
diff --git a/examples/wifi-echo/server/esp32/main/Screen.cpp b/examples/common/screen-framework/Screen.cpp
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/Screen.cpp
rename to examples/common/screen-framework/Screen.cpp
diff --git a/examples/wifi-echo/server/esp32/main/ScreenManager.cpp b/examples/common/screen-framework/ScreenManager.cpp
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/ScreenManager.cpp
rename to examples/common/screen-framework/ScreenManager.cpp
diff --git a/examples/common/screen-framework/component.mk b/examples/common/screen-framework/component.mk
new file mode 100644
index 00000000000000..5ed0594cd5b0d2
--- /dev/null
+++ b/examples/common/screen-framework/component.mk
@@ -0,0 +1,24 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#    All rights reserved.
+#
+#    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.
+#
+#    Description:
+#      Component makefile for the screen framework component used by the CHIP
+#      ESP32 demo applications.
+#
+
+COMPONENT_ADD_INCLUDEDIRS := include
+COMPONENT_SRCDIRS := .
+COMPONENT_OBJS := Display.o ScreenManager.o Screen.o ListScreen.o
diff --git a/examples/wifi-echo/server/esp32/main/include/Display.h b/examples/common/screen-framework/include/Display.h
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/include/Display.h
rename to examples/common/screen-framework/include/Display.h
diff --git a/examples/wifi-echo/server/esp32/main/include/ListScreen.h b/examples/common/screen-framework/include/ListScreen.h
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/include/ListScreen.h
rename to examples/common/screen-framework/include/ListScreen.h
diff --git a/examples/wifi-echo/server/esp32/main/include/Screen.h b/examples/common/screen-framework/include/Screen.h
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/include/Screen.h
rename to examples/common/screen-framework/include/Screen.h
diff --git a/examples/wifi-echo/server/esp32/main/include/ScreenManager.h b/examples/common/screen-framework/include/ScreenManager.h
similarity index 100%
rename from examples/wifi-echo/server/esp32/main/include/ScreenManager.h
rename to examples/common/screen-framework/include/ScreenManager.h
diff --git a/examples/wifi-echo/server/esp32/Makefile b/examples/wifi-echo/server/esp32/Makefile
index 8dc5ee6bd8a7bd..abc1b9ec996bdb 100644
--- a/examples/wifi-echo/server/esp32/Makefile
+++ b/examples/wifi-echo/server/esp32/Makefile
@@ -24,6 +24,7 @@ PROJECT_NAME := chip-wifi-echo
 EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/third_party/connectedhomeip/config/esp32/components \
                         $(PROJECT_PATH)/../../../common/m5stack-tft/repo/components \
                         $(PROJECT_PATH)/../../../common/QRCode \
+                        $(PROJECT_PATH)/../../../common/screen-framework \
 
 CXXFLAGS += -std=c++11 -Os
 CPPFLAGS += -Os

From b80015e38fca4c635c188d0550dc5fba1b7a6365 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Fri, 10 Jul 2020 16:50:37 -0400
Subject: [PATCH 41/74] Fix GN examples workflow not saving the outputs (#1559)

* Fix GN examples workflow not saving the outputs

* Change BUILD_TYPE for gn examples
---
 .github/workflows/gn_examples.yaml | 44 ++++++++++++++++++++----------
 examples/chip-tool/BUILD.gn        |  2 +-
 examples/shell/BUILD.gn            |  2 +-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/gn_examples.yaml b/.github/workflows/gn_examples.yaml
index 2c34f50fa3db05..971208233c61c0 100644
--- a/.github/workflows/gn_examples.yaml
+++ b/.github/workflows/gn_examples.yaml
@@ -9,7 +9,7 @@ jobs:
         name: nRF
 
         env:
-            BUILD_TYPE: nrf
+            BUILD_TYPE: gn_nrf
             BUILD_VERSION: 0.2.14
             BUILD_IMAGE: chip-build-nrf-platform
             BUILD_ORG: connectedhomeip
@@ -33,18 +33,26 @@ jobs:
               run: scripts/examples/gn_nrf_example.sh examples/lock-app/nrf5 out/lock_app_debug
             - name: Build example nRF5 Lighting App
               run: scripts/examples/gn_nrf_example.sh examples/lighting-app/nrf5 out/lighting_app_debug
-            - name: Preserve artifacts
-              run: |
-                  mkdir -p example_binaries/nrf-build
-                  cp out/lock_app_debug/chip-nrf52840-lock-example \
-                     out/lighting_app_debug/chip-nrf52840-lighting-example \
-                     example_binaries/nrf-build/
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/action-cond@v1.0.0
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name: ${{ env.BUILD_TYPE }}-example-build-${{ steps.outsuffix.outputs.value }}
+                  path: |
+                          out/lock_app_debug/chip-nrf52840-lock-example
+                          out/lighting_app_debug/chip-nrf52840-lighting-example
 
     linux-standalone:
         name: Linux Standalone
 
         env:
-            BUILD_TYPE: linux
+            BUILD_TYPE: gn_linux
             BUILD_VERSION: 0.2.14
             BUILD_IMAGE: chip-build
             BUILD_ORG: connectedhomeip
@@ -68,9 +76,17 @@ jobs:
               run: scripts/examples/gn_build_example.sh examples/chip-tool out/chip_tool_debug
             - name: Build example Standalone Shell
               run: scripts/examples/gn_build_example.sh examples/shell out/shell_debug
-            - name: Preserve artifacts
-              run: |
-                  mkdir -p example_binaries/$BUILD_TYPE
-                  cp out/chip_tool_debug/bin/chip-standalone-demo \
-                     out/shell_debug/bin/chip-shell \
-                     example_binaries/$BUILD_TYPE/
+            - name: Binary artifact suffix
+              id: outsuffix
+              uses: haya14busa/action-cond@v1.0.0
+              with:
+                  cond: ${{ github.event.pull_request.number == '' }}
+                  if_true: "${{ github.sha }}"
+                  if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Uploading Binaries
+              uses: actions/upload-artifact@v2
+              with:
+                  name: ${{ env.BUILD_TYPE }}-example-build-${{ steps.outsuffix.outputs.value }}
+                  path: |
+                          out/chip_tool_debug/chip-standalone-demo
+                          out/shell_debug/chip-shell
diff --git a/examples/chip-tool/BUILD.gn b/examples/chip-tool/BUILD.gn
index f0713d89b6269b..64495f2456a4ae 100644
--- a/examples/chip-tool/BUILD.gn
+++ b/examples/chip-tool/BUILD.gn
@@ -29,7 +29,7 @@ executable("chip-standalone-demo") {
 
   public_deps = [ "${chip_root}/src/lib" ]
 
-  output_dir = "${root_out_dir}/bin"
+  output_dir = root_out_dir
 }
 
 group("chip-tool") {
diff --git a/examples/shell/BUILD.gn b/examples/shell/BUILD.gn
index ed5a84f17cb8a5..a3c5853f9bf7be 100644
--- a/examples/shell/BUILD.gn
+++ b/examples/shell/BUILD.gn
@@ -33,7 +33,7 @@ executable("chip-shell") {
     defines = [ "BUILD_RELEASE=1" ]
   }
 
-  output_dir = "${root_out_dir}/bin"
+  output_dir = root_out_dir
 }
 
 group("shell") {

From bc69486f7fbca9a150d161a5623a6bad88425bd4 Mon Sep 17 00:00:00 2001
From: Marc Lepage <67919234+mlepage-google@users.noreply.github.com>
Date: Fri, 10 Jul 2020 16:58:08 -0400
Subject: [PATCH 42/74] Fix CFLAGS in Makefile (#1562)

Noticed a typo in ESP32 demo Makefile which likely explains why are
builds are unexpectedly large.
---
 examples/wifi-echo/server/esp32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/wifi-echo/server/esp32/Makefile b/examples/wifi-echo/server/esp32/Makefile
index abc1b9ec996bdb..97bde5213c670a 100644
--- a/examples/wifi-echo/server/esp32/Makefile
+++ b/examples/wifi-echo/server/esp32/Makefile
@@ -28,6 +28,6 @@ EXTRA_COMPONENT_DIRS += $(PROJECT_PATH)/third_party/connectedhomeip/config/esp32
 
 CXXFLAGS += -std=c++11 -Os
 CPPFLAGS += -Os
-CLAGS += -Os
+CFLAGS += -Os
 
 include $(IDF_PATH)/make/project.mk

From 02ba5b7791ff57a44988930d11375b238b536176 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andrei@andy314.com>
Date: Fri, 10 Jul 2020 22:24:09 -0400
Subject: [PATCH 43/74] Update version for android image, fix dpkg install
 error in nrf connect image (#1561)

---
 integrations/docker/images/chip-build-android/version         | 2 +-
 .../docker/images/chip-build-nrfconnect-platform/Dockerfile   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 120000 integrations/docker/images/chip-build-android/version

diff --git a/integrations/docker/images/chip-build-android/version b/integrations/docker/images/chip-build-android/version
deleted file mode 100644
index 51e8fdc95c2bab..00000000000000
--- a/integrations/docker/images/chip-build-android/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2.18
diff --git a/integrations/docker/images/chip-build-android/version b/integrations/docker/images/chip-build-android/version
new file mode 120000
index 00000000000000..a4280acd348e7f
--- /dev/null
+++ b/integrations/docker/images/chip-build-android/version
@@ -0,0 +1 @@
+../chip-build/version
\ No newline at end of file
diff --git a/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile b/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile
index 806806bc1ebe14..ead7ca1108cb6d 100644
--- a/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile
+++ b/integrations/docker/images/chip-build-nrfconnect-platform/Dockerfile
@@ -11,8 +11,8 @@ RUN set -x \
     # nRF Tools for flashing software on Nordic devices, and accessing device logs
     && wget -qO- https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF-command-line-tools/sw/Versions-10-x-x/10-7-0/nRFCommandLineTools1070Linuxamd64tar.gz \
         | tar xz -C /tmp \
-    && dpkg -i /tmp/JLink_Linux_*.deb \
-    && dpkg -i /tmp/nRF-Command-Line-Tools_*.deb \
+    && dpkg -i --force-depends /tmp/JLink_Linux_*.deb \
+    && dpkg -i --force-depends /tmp/nRF-Command-Line-Tools_*.deb \
     # nRF Connect SDK dependencies
     && pip3 install --no-cache-dir setuptools wheel cmake west pyyaml \
     # nRF Connect SDK 1.3.0 sources & requirements

From 57167060d4f4db5de8022249efc86931fac1dea2 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Mon, 13 Jul 2020 09:36:00 -0400
Subject: [PATCH 44/74] Add default build with linux device layer (#1568)

* Add default build with linux device layer

* Rename linux_embedded to linux_x64_gcc_embedded for consistency
---
 BUILD.gn                        | 24 ++++++++++++++++++++----
 config/linux/toolchain/BUILD.gn | 26 ++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 config/linux/toolchain/BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 534a0b7cffa267..51964f737f22f7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -106,8 +106,11 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     # Enable building chip with gcc.
     enable_host_gcc_build = enable_default_builds
 
-    # Build building chip with gcc & mbedtls.
-    enable_host_gcc_mbdtls_build = enable_default_builds
+    # Enable building chip with gcc & mbedtls.
+    enable_host_gcc_mbedtls_build = enable_default_builds
+
+    # Enable building chip for linux embedded.
+    enable_linux_embedded_build = enable_default_builds && host_os == "linux"
 
     # Build the chip-tool example.
     enable_standalone_chip_tool_build = enable_default_builds
@@ -134,6 +137,13 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     toolchain = "${chip_root}/config/mbedtls/toolchain:${host_os}_${host_cpu}_gcc_mbedtls"
   }
 
+  if (host_os == "linux") {
+    chip_build("linux_embedded") {
+      toolchain =
+          "${chip_root}/config/linux/toolchain:linux_${host_cpu}_gcc_embedded"
+    }
+  }
+
   standalone_toolchain = "${chip_root}/config/standalone/toolchain:standalone"
 
   group("standalone_chip_tool") {
@@ -164,9 +174,12 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
     if (enable_host_gcc_build) {
       deps += [ ":all_host_gcc" ]
     }
-    if (enable_host_gcc_mbdtls_build) {
+    if (enable_host_gcc_mbedtls_build) {
       deps += [ ":all_host_gcc_mbedtls" ]
     }
+    if (enable_linux_embedded_build) {
+      deps += [ ":all_linux_embedded" ]
+    }
     if (enable_standalone_chip_tool_build) {
       deps += [ ":standalone_chip_tool" ]
     }
@@ -190,9 +203,12 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       if (enable_host_gcc_build) {
         deps += [ ":check_host_gcc" ]
       }
-      if (enable_host_gcc_mbdtls_build) {
+      if (enable_host_gcc_mbedtls_build) {
         deps += [ ":check_host_gcc_mbedtls" ]
       }
+      if (enable_linux_embedded_build) {
+        deps += [ ":check_linux_embedded" ]
+      }
     }
   }
 }
diff --git a/config/linux/toolchain/BUILD.gn b/config/linux/toolchain/BUILD.gn
new file mode 100644
index 00000000000000..c77a89f01e66e9
--- /dev/null
+++ b/config/linux/toolchain/BUILD.gn
@@ -0,0 +1,26 @@
+# Copyright (c) 2020 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.
+
+import("//build_overrides/chip.gni")
+
+import("//build/toolchain/gcc_toolchain.gni")
+
+gcc_toolchain("linux_${host_cpu}_gcc_embedded") {
+  toolchain_args = {
+    current_os = "linux"
+    current_cpu = host_cpu
+    is_clang = false
+    import("${chip_root}/src/platform/Linux/args.gni")
+  }
+}

From 8a4e6b4484d89bb99787a17d756ea33bf7940d46 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Mon, 13 Jul 2020 09:37:52 -0400
Subject: [PATCH 45/74] Fix TestPlatformTime under load (#1571)

This test is timing dependent and is flaking in CI.

fixes #1567
---
 src/platform/tests/TestPlatformTime.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/platform/tests/TestPlatformTime.cpp b/src/platform/tests/TestPlatformTime.cpp
index d05a2881aa23fe..e41ec662c1701b 100644
--- a/src/platform/tests/TestPlatformTime.cpp
+++ b/src/platform/tests/TestPlatformTime.cpp
@@ -184,7 +184,6 @@ static void TestDevice_GetClock_MonotonicHiRes(nlTestSuite * inSuite, void * inC
         ChipLogProgress(DeviceLayer, "Start=%" PRIu64 " End=%" PRIu64 " Delta=%" PRIu64 " Expected=%" PRIu64, Tstart, Tend, Tdelta,
                         Tdelay);
         NL_TEST_ASSERT(inSuite, Tdelta > (Tdelay - margin));
-        NL_TEST_ASSERT(inSuite, Tdelta < (Tdelay + margin));
         numOfTestsRan++;
     }
     NL_TEST_ASSERT(inSuite, numOfTestsRan > 0);

From 783dcfec863b0979900d79b10b2573097a4b07e8 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Mon, 13 Jul 2020 09:38:28 -0400
Subject: [PATCH 46/74] Fix nRF5 lock app build instructions (#1572)

After 52b6f0320 ("[gn] Vscode integration. Fixes #1526. (#1527)")
the args are missing due to being set later in the script. Rearrange
so the correct comment is printed.
---
 gn_build.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gn_build.sh b/gn_build.sh
index 9aa9e9d5609db5..8a86dab6d79381 100755
--- a/gn_build.sh
+++ b/gn_build.sh
@@ -69,6 +69,14 @@ echo 'To build a custom build (for help run "gn args --list out/debug")'
 echo gn args "$CHIP_ROOT/out/custom"
 echo ninja -C "$CHIP_ROOT/out/custom"
 
+nrf5_sdk_args=""
+extra_args=""
+
+if [[ -d "$NRF5_SDK_ROOT/components/libraries" ]]; then
+    nrf5_sdk_args+="nrf5_sdk_root=\"$NRF5_SDK_ROOT\""
+    extra_args+=" $nrf5_sdk_args enable_nrf5_builds=true"
+fi
+
 echo
 if [[ ! -d "$NRF5_SDK_ROOT/components/libraries" ]]; then
     echo "Hint: Set \$NRF5_SDK_ROOT to enable building for nRF5"
@@ -80,14 +88,6 @@ echo
 
 _chip_banner "Build: GN configure"
 
-nrf5_sdk_args=""
-extra_args=""
-
-if [[ -d "$NRF5_SDK_ROOT/components/libraries" ]]; then
-    nrf5_sdk_args+="nrf5_sdk_root=\"$NRF5_SDK_ROOT\""
-    extra_args+=" $nrf5_sdk_args enable_nrf5_builds=true"
-fi
-
 gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/debug" --args='target_os="all"'"$extra_args"
 gn --root="$CHIP_ROOT" gen --check "$CHIP_ROOT/out/release" --args='target_os="all" is_debug=false'"$extra_args"
 

From 2733a128d2732128c9e10b2eff99ebbe03ace801 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Mon, 13 Jul 2020 09:43:13 -0400
Subject: [PATCH 47/74] Add missing headers to //src/platform (#1569)

These were missed due to being outside the src/platform directory.
---
 src/platform/BUILD.gn | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index f81ec92b6e535b..3962e970d01e75 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -59,6 +59,40 @@ if (device_platform != "none") {
     output_name = "libDeviceLayer"
 
     sources = [
+      "../include/platform/CHIPDeviceConfig.h",
+      "../include/platform/CHIPDeviceError.h",
+      "../include/platform/CHIPDeviceEvent.h",
+      "../include/platform/CHIPDeviceLayer.h",
+      "../include/platform/ConfigurationManager.h",
+      "../include/platform/ConnectivityManager.h",
+      "../include/platform/GeneralUtils.h",
+      "../include/platform/PersistedStorage.h",
+      "../include/platform/PlatformManager.h",
+      "../include/platform/SoftwareUpdateManager.h",
+      "../include/platform/SoftwareUpdateManagerImpl.h",
+      "../include/platform/ThreadStackManager.h",
+      "../include/platform/TimeSyncManager.h",
+      "../include/platform/internal/BLEManager.h",
+      "../include/platform/internal/CHIPDeviceLayerInternal.h",
+      "../include/platform/internal/DeviceDescriptionServer.h",
+      "../include/platform/internal/DeviceNetworkInfo.h",
+      "../include/platform/internal/EventLogging.h",
+      "../include/platform/internal/GenericConfigurationManagerImpl.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_BLE.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_NoThread.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h",
+      "../include/platform/internal/GenericConnectivityManagerImpl_Thread.h",
+      "../include/platform/internal/GenericNetworkProvisioningServerImpl.h",
+      "../include/platform/internal/GenericPlatformManagerImpl.h",
+      "../include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h",
+      "../include/platform/internal/GenericPlatformManagerImpl_POSIX.h",
+      "../include/platform/internal/GenericSoftwareUpdateManagerImpl.h",
+      "../include/platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h",
+      "../include/platform/internal/NetworkProvisioningServer.h",
+      "../include/platform/internal/testing/ConfigUnitTest.h",
       "GeneralUtils.cpp",
       "Globals.cpp",
       "PersistedStorage.cpp",
@@ -144,6 +178,8 @@ if (device_platform != "none") {
         ]
       }
     }
+
+    allow_circular_includes_from = [ "${chip_root}/src/lib/support" ]
   }
 } else {
   group("platform") {

From 1a24b07997b800facf0661c89ed4da62c09900d2 Mon Sep 17 00:00:00 2001
From: Song Guo <songguo@google.com>
Date: Wed, 15 Jul 2020 00:06:37 +0800
Subject: [PATCH 48/74] [OpenThread] ReceivePacket should use PBUF_LINK when
 allocating pbuf (#1591)

---
 .../GenericThreadStackManagerImpl_OpenThread_LwIP.ipp           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp
index b4a8a45448247b..334ce533d786ec 100644
--- a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp
+++ b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.ipp
@@ -378,7 +378,7 @@ void GenericThreadStackManagerImpl_OpenThread_LwIP<ImplClass>::ReceivePacket(otM
     struct netif * threadNetIf = ThreadStackMgrImpl().ThreadNetIf();
 
     // Allocate an LwIP pbuf to hold the inbound packet.
-    pbuf = pbuf_alloc(PBUF_RAW, pktLen, PBUF_POOL);
+    pbuf = pbuf_alloc(PBUF_LINK, pktLen, PBUF_POOL);
     VerifyOrExit(pbuf != NULL, lwipErr = ERR_MEM);
 
     // Copy the packet data from the OpenThread message object to the pbuf.

From 7cf0d80f9c8ac7ed2cd9379eaef03847d731ebe7 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Tue, 14 Jul 2020 12:07:05 -0400
Subject: [PATCH 49/74] Fix data race in GenericPlatformManagerImpl_POSIX.ipp
 (#1588)

* Fix data race in GenericPlatformManagerImpl_POSIX.ipp

The mShouldRunEventLoop member variable is used for cross thread
communication without synchronization. This is a data race unless an
atomic variable is used. Make it so.

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
---
 .../platform/internal/GenericPlatformManagerImpl_POSIX.h    | 3 ++-
 .../platform/internal/GenericPlatformManagerImpl_POSIX.ipp  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
index 63535d486222ca..47c1c312e269bf 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h
@@ -33,6 +33,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#include <atomic>
 #include <pthread.h>
 #include <queue>
 
@@ -93,7 +94,7 @@ class GenericPlatformManagerImpl_POSIX : public GenericPlatformManagerImpl<ImplC
 
     void ProcessDeviceEvents();
 
-    bool mShouldRunEventLoop;
+    std::atomic<bool> mShouldRunEventLoop;
     static void * EventLoopTaskMain(void * arg);
 };
 
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
index 77e0141a5e3da9..2d2437d8d5ca8a 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
@@ -73,7 +73,7 @@ CHIP_ERROR GenericPlatformManagerImpl_POSIX<ImplClass>::_InitChipStack(void)
     err = GenericPlatformManagerImpl<ImplClass>::_InitChipStack();
     SuccessOrExit(err);
 
-    mShouldRunEventLoop = true;
+    mShouldRunEventLoop.store(true, std::memory_order_relaxed);
 
 exit:
     return err;
@@ -196,7 +196,7 @@ void GenericPlatformManagerImpl_POSIX<ImplClass>::_RunEventLoop(void)
     {
         SysUpdate();
         SysProcess();
-    } while (mShouldRunEventLoop);
+    } while (mShouldRunEventLoop.load(std::memory_order_relaxed));
 
     Impl()->UnlockChipStack();
 
@@ -232,7 +232,7 @@ template <class ImplClass>
 CHIP_ERROR GenericPlatformManagerImpl_POSIX<ImplClass>::_Shutdown(void)
 {
     int err;
-    mShouldRunEventLoop = false;
+    mShouldRunEventLoop.store(false, std::memory_order_relaxed);;
     err                 = pthread_join(mChipTask, NULL);
     SuccessOrExit(err);
 

From 741db9d5b64234298e853e229ac4b9a5ddb37735 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Tue, 14 Jul 2020 09:07:58 -0700
Subject: [PATCH 50/74] Fix activate.sh to find CHIP_ROOT (#1585)

* fix activate.sh

* fix bootstrap.sh, too
---
 scripts/activate.sh  | 9 ++++++---
 scripts/bootstrap.sh | 8 +++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/scripts/activate.sh b/scripts/activate.sh
index 811f98351762f4..4c82647ca87d0a 100644
--- a/scripts/activate.sh
+++ b/scripts/activate.sh
@@ -13,9 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-if [[ ! -d "${CHIP_ROOT}" ]]; then
-    CHIP_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+if [[ ! -d ${CHIP_ROOT} ]]; then
+    if [[ -n ${BASH_SOURCE[0]} ]]; then
+        CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+    else
+        CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
+    fi
 fi
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index c26a06d5f303df..6fa79dde5b8d07 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -14,7 +14,13 @@
 # limitations under the License.
 #
 
-CHIP_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+if [[ ! -d ${CHIP_ROOT} ]]; then
+    if [[ -n ${BASH_SOURCE[0]} ]]; then
+        CHIP_ROOT=$(cd "${BASH_SOURCE[0]%/*}/.." && pwd)
+    else
+        CHIP_ROOT=$(cd "${0%/*}/.." && pwd)
+    fi
+fi
 
 export PW_BRANDING_BANNER="$CHIP_ROOT/.chip-banner.txt"
 export PW_BRANDING_BANNER_COLOR="bold_white"

From ef6ff7b7c69afb3f8a98966e5c40462ff068d043 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Tue, 14 Jul 2020 12:09:09 -0400
Subject: [PATCH 51/74] Fix some configuration differences between GN &
 automake (#1582)

The standalone project configs now apply unless specifically overriden,
which matches configure's behavior. Previously the project configs were
disabled by default, so the defaults inline in CHIPConfig.h applied.

Note there are at 3 sources of defaults here which lead to this
confusion:

(1) The defaults used by scripts/build/bootstrap.sh, which calls
    configure with very few arguments. This uses the standalone
    project configs and builds tests.

(2) The defaults used by config/standalone/standalone-chip.mk, which
    calls configure and overrides a few arguments. This uses the
    standalone project configs, but disables some components, and
    does not build tests.

(3) The defaults specified directly in CHIPConfig.h et al. These
    defaults may have no effect because configure always overrides
    them using BuildConfig.h. GN currently doesn't use BuildConfig.h,
    but uses the command line to get the same result.
---
 config/standalone/args.gni | 11 +++++------
 src/lib/support/BUILD.gn   |  8 ++++++++
 src/system/BUILD.gn        | 10 ++++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/config/standalone/args.gni b/config/standalone/args.gni
index 162d52f203c3e5..4b2640923ea6eb 100644
--- a/config/standalone/args.gni
+++ b/config/standalone/args.gni
@@ -12,11 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Options from standalone-chip.mk that differ from configure defaults. These
+# options are used from examples/.
 chip_build_tests = false
-
 config_network_layer_ble = false
-inet_config_enable_async_dns_sockets = false
-
-project_config_include_dirs = rebase_path([ "." ])
-chip_project_config_include = "<CHIPProjectConfig.h>"
-system_project_config_include = "<SystemProjectConfig.h>"
+inet_config_enable_tun_endpoint = false
+inet_config_enable_raw_endpoint = false
+inet_config_enable_dns_resolver = false
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index f46e9903ac6829..09e7929c1d3e45 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -98,6 +98,14 @@ static_library("support") {
     "${nlassert_root}:nlassert",
   ]
 
+  # These are needed because we include CHIPCore.h, which uses config
+  # options for src/ble and src/inet, however we cannot depend on those
+  # directly as such a dependency is cyclic.
+  public_deps += [
+    "${chip_root}/src/ble:ble_config_header",
+    "${chip_root}/src/inet:inet_config_header",
+  ]
+
   public_configs = [ ":support_config" ]
 
   if (chip_config_memory_management == "simple") {
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index d22598e1d8dc68..d6bc99c829a6d9 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -22,14 +22,14 @@ import("system.gni")
 declare_args() {
   # Extra header to include in CHIPConfig.h for project.
   # TODO - This should probably be in src/core but src/system also uses it.
-  chip_project_config_include = ""
+  chip_project_config_include = "<CHIPProjectConfig.h>"
 
   # Extra header to include in CHIPConfig.h for platform.
   # TODO - This should probably be in src/core but src/system also uses it.
   chip_platform_config_include = ""
 
   # Extra header to include in SystemConfig.h for project.
-  system_project_config_include = ""
+  system_project_config_include = "<SystemProjectConfig.h>"
 
   # Extra header to include in SystemConfig.h for platform.
   system_platform_config_include = ""
@@ -38,6 +38,12 @@ declare_args() {
   project_config_include_dirs = []
 }
 
+if (project_config_include_dirs == [] &&
+    chip_project_config_include == "<CHIPProjectConfig.h>" &&
+    system_project_config_include == "<SystemProjectConfig.h>") {
+  project_config_include_dirs += [ "${chip_root}/config/standalone" ]
+}
+
 config("system_config") {
   configs = [ "${chip_root}/src:includes" ]
 

From 37d58ad38a25273912fc0786d934848f83187209 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <44623591+yufengwangca@users.noreply.github.com>
Date: Tue, 14 Jul 2020 09:09:45 -0700
Subject: [PATCH 52/74] Fix AC_DEFINE description message to align with macro
 define value (#1580)

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c060bf0b7bb7b..3a07ce0c95dfb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1541,7 +1541,7 @@ fi
 AM_CONDITIONAL([CHIP_WITH_OPENSSL], [test "${nl_with_openssl}" != "no"])
 
 if test "${nl_with_openssl}" = "no"; then
-    AC_DEFINE([CHIP_WITH_OPENSSL], [0], [Define to 1 to build CHIP with OpenSSL])
+    AC_DEFINE([CHIP_WITH_OPENSSL], [0], [Define to 0 to build CHIP without OpenSSL])
 else
     AC_DEFINE([CHIP_WITH_OPENSSL], [1], [Define to 1 to build CHIP with OpenSSL])
 fi
@@ -1611,7 +1611,7 @@ AM_CONDITIONAL([CHIP_WITH_MBEDTLS_INTERNAL], [test "${nl_with_mbedtls}" = "inter
 AM_CONDITIONAL([CHIP_WITH_MBEDTLS], [test "${nl_with_mbedtls}" != "no"])
 
 if test "${nl_with_mbedtls}" = "no"; then
-    AC_DEFINE([CHIP_WITH_MBEDTLS], [0], [Define to 1 to build CHIP with mbedTLS])
+    AC_DEFINE([CHIP_WITH_MBEDTLS], [0], [Define to 0 to build CHIP without mbedTLS])
 else
     AC_DEFINE([CHIP_WITH_MBEDTLS], [1], [Define to 1 to build CHIP with mbedTLS])
 fi
@@ -1785,7 +1785,7 @@ AM_CONDITIONAL([CHIP_WITH_NLFAULTINJECTION], [test "${nl_with_nlfaultinjection}"
 AM_CONDITIONAL([CHIP_WITH_NLFAULTINJECTION_INTERNAL], [test "${nl_with_nlfaultinjection}" = "internal"])
 
 if test "${nl_with_nlfaultinjection}" = "no"; then
-    AC_DEFINE([CHIP_WITH_NLFAULTINJECTION], [0], [Define to 1 to build CHIP with nlFaultInjection features])
+    AC_DEFINE([CHIP_WITH_NLFAULTINJECTION], [0], [Define to 0 to build CHIP without nlFaultInjection features])
 else
     AC_DEFINE([CHIP_WITH_NLFAULTINJECTION], [1], [Define to 1 to build CHIP with nlFaultInjection features])
 fi

From 7f0cd954a208426cc1778d2e5c71055dc1f8bfda Mon Sep 17 00:00:00 2001
From: Yakun Xu <xyk@google.com>
Date: Wed, 15 Jul 2020 00:10:33 +0800
Subject: [PATCH 53/74] [nrf5] build with internal OpenThread (#1579)

This commit adds support to build with internal OpenThread on the Nordic
platform.
---
 config/nrf5/nrf5-chip.mk            |   2 +-
 configure.ac                        | 142 +++++++++++++++++++++-------
 examples/lighting-app/nrf5/Makefile |  28 ++----
 examples/lock-app/nrf5/Makefile     |  28 ++----
 third_party/Makefile.am             |   3 +-
 third_party/openthread/repo         |   2 +-
 6 files changed, 125 insertions(+), 80 deletions(-)

diff --git a/config/nrf5/nrf5-chip.mk b/config/nrf5/nrf5-chip.mk
index 8abc89e69daeb3..38ea27e1bf232d 100644
--- a/config/nrf5/nrf5-chip.mk
+++ b/config/nrf5/nrf5-chip.mk
@@ -109,7 +109,7 @@ CHIP_CONFIGURE_OPTIONS = \
     --with-chip-ble-project-includes=$(CHIP_PROJECT_CONFIG) \
     --with-chip-warm-project-includes=$(CHIP_PROJECT_CONFIG) \
     --with-chip-device-project-includes=$(CHIP_PROJECT_CONFIG) \
-    --with-openthread=$(NRF5_SDK_ROOT)/external/openthread \
+    --with-openthread=internal \
     --disable-ipv4 \
     --disable-tests \
     --disable-tools \
diff --git a/configure.ac b/configure.ac
index 3a07ce0c95dfb6..bc493a56d2174b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,36 +904,6 @@ NL_ENABLE_DOCS([auto],[NO])
 
 AM_CONDITIONAL(CHIP_BUILD_DOCS, [test "${nl_cv_build_docs}" = "yes"])
 
-#
-# OpenThread
-#
-
-NL_WITH_OPTIONAL_INTERNAL_PACKAGE(
-    [OpenThread],
-    [OPENTHREAD],
-    [openthread],
-    [],
-    [
-        AC_MSG_NOTICE([No internal OpenThread support yet!])
-        with_openthread=no
-    ],
-    [
-        # Check for required OpenThread headers.
-        AC_CHECK_HEADERS([openthread/dataset.h] [openthread/dataset_ftd.h] [openthread/error.h] [openthread/icmp6.h] [openthread/instance.h] [openthread/ip6.h] [openthread/link.h] [openthread/message.h] [openthread/netdata.h] [openthread/tasklet.h] [openthread/thread.h],
-        [],
-        [
-            AC_MSG_ERROR(The nlio header "$ac_header" is required but cannot be found.)
-        ])
-    ]
-)
-AM_CONDITIONAL([CHIP_ENABLE_OPENTHREAD], [test "${with_openthread}" != "no"])
-if test "${with_openthread}" != "no"; then
-    CHIP_ENABLE_OPENTHREAD=1
-else
-    CHIP_ENABLE_OPENTHREAD=0
-fi
-AC_DEFINE_UNQUOTED([CHIP_ENABLE_OPENTHREAD],[${CHIP_ENABLE_OPENTHREAD}],[Define to 1 if you want to enable OpenThread.])
-
 #
 # Network Technology Layer
 #
@@ -1043,6 +1013,8 @@ nrf5)
       CONFIG_DEVICE_LAYER=1
       CHIP_DEVICE_LAYER_TARGET=nRF5
       CHIP_DEVICE_LAYER_TARGET_NRF5=1
+      CFLAGS="${CFLAGS} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mabi=aapcs"
+      CXXFLAGS="${CXXFLAGS} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mabi=aapcs"
       ;;
 
 linux)
@@ -1616,6 +1588,106 @@ else
     AC_DEFINE([CHIP_WITH_MBEDTLS], [1], [Define to 1 to build CHIP with mbedTLS])
 fi
 
+#
+# OpenThread
+#
+
+NL_WITH_OPTIONAL_INTERNAL_PACKAGE(
+    [OpenThread],
+    [OPENTHREAD],
+    [openthread],
+    [],
+    [
+        # use absolute path to support build out of source tree
+        chip_srcdir="$(cd ${srcdir} && pwd)"
+
+        # bootstrap
+        test -f ${chip_srcdir}/third_party/openthread/repo/configure || (cd ${chip_srcdir}/third_party/openthread/repo && ./bootstrap)
+
+        case "${with_device_layer}" in
+        nrf5)
+            OPENTHREAD_CPPFLAGS="-I\${abs_top_srcdir}/third_party/openthread/repo/include"
+            OPENTHREAD_LDFLAGS="-L${ac_pwd}/third_party/openthread"
+            OPENTHREAD_LIBS="-lopenthread-cli-ftd \
+                -lopenthread-ftd \
+                -lopenthread-platform-utils \
+                -lopenthread-nrf52840-transport \
+                -lopenthread-nrf52840-softdevice-sdk \
+                -lnordicsemi-nrf52840-radio-driver-softdevice \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedcrypto_glue.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedcrypto_glue_cc310.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedcrypto_glue_vanilla.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedcrypto_cc310_backend.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedcrypto_vanilla_backend.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedtls_base_vanilla.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedtls_tls_vanilla.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libmbedtls_x509_vanilla.a \
+                \${NRF5_SDK_ROOT}/external/openthread/nrf_security/lib/libnrf_cc310_platform_0.9.1.a"
+
+            # private definitions
+            ot_cppflags="-Wno-expansion-to-defined \
+                -I${chip_srcdir}/third_party/openthread/repo/examples/platforms/nrf528xx/nrf52840 \
+                -I${chip_srcdir}/third_party/openthread/repo/third_party/NordicSemiconductor/libraries/nrf_security/config \
+                -I${chip_srcdir}/third_party/openthread/repo/third_party/NordicSemiconductor/libraries/nrf_security/include \
+                -I${chip_srcdir}/third_party/openthread/repo/third_party/NordicSemiconductor/libraries/nrf_security/mbedtls_plat_config \
+                -I${chip_srcdir}/third_party/openthread/repo/third_party/NordicSemiconductor/libraries/nrf_security/nrf_cc310_plat/include \
+                -I${chip_srcdir}/third_party/mbedtls/repo/include \
+                -DMBEDTLS_CONFIG_FILE=\<nrf-config.h\> \
+                -DMBEDTLS_USER_CONFIG_FILE=\<nrf52840-mbedtls-config.h\> \
+                -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE=\<openthread-core-nrf52840-config.h\> \
+                -DOPENTHREAD_CORE_CONFIG_PLATFORM_CHECK_FILE=\<openthread-core-nrf52840-config-check.h\> \
+                -DOPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE=1 \
+                -DOPENTHREAD_CONFIG_JOINER_ENABLE=1 \
+                -DOPENTHREAD_CONFIG_NCP_UART_ENABLE=1 \
+                -DUART_AS_SERIAL_TRANSPORT=1"
+
+            (mkdir -p ${ac_pwd}/third_party/openthread \
+             && cd ${ac_pwd}/third_party/openthread \
+             && CPPFLAGS="${ot_cppflags}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${chip_srcdir}/third_party/openthread/repo/configure \
+             --disable-builtin-mbedtls \
+             --disable-docs \
+             --disable-executable \
+             --disable-tools \
+             --enable-cli \
+             --enable-ftd \
+             --host=arm-none-eabi \
+             --prefix=${prefix} \
+             --exec-prefix=${exec_prefix} \
+             --with-examples=nrf52840)
+
+            if test $? != 0; then
+                AC_MSG_ERROR([Failed to configure OpenThread!])
+            fi
+
+            maybe_openthread_dirstem="openthread"
+            ;;
+
+        *)
+            AC_MSG_NOTICE([No internal OpenThread support yet!])
+            nl_with_openthread=no
+            with_openthread=no
+            ;;
+        esac
+    ],
+    [
+        # Check for required OpenThread headers.
+        AC_CHECK_HEADERS([openthread/dataset.h] [openthread/dataset_ftd.h] [openthread/error.h] [openthread/icmp6.h] [openthread/instance.h] [openthread/ip6.h] [openthread/link.h] [openthread/message.h] [openthread/netdata.h] [openthread/tasklet.h] [openthread/thread.h],
+        [],
+        [
+            AC_MSG_ERROR(The OpenThread header "$ac_header" is required but cannot be found.)
+        ])
+        maybe_openthread_dirstem=""
+    ]
+)
+AC_SUBST(OPENTHREAD_SUBDIRS, [${maybe_openthread_dirstem}])
+AM_CONDITIONAL([CHIP_ENABLE_OPENTHREAD], [test "${nl_with_openthread}" != "no"])
+if test "${nl_with_openthread}" != "no"; then
+    CHIP_ENABLE_OPENTHREAD=1
+else
+    CHIP_ENABLE_OPENTHREAD=0
+fi
+AC_DEFINE_UNQUOTED([CHIP_ENABLE_OPENTHREAD],[${CHIP_ENABLE_OPENTHREAD}],[Define to 1 if you want to enable OpenThread.])
+
 #
 # LwIP
 #
@@ -2139,9 +2211,9 @@ AC_SUBST(CRYPTO_CPPFLAGS)
 AC_SUBST(CRYPTO_LDFLAGS)
 AC_SUBST(CRYPTO_LIBS)
 
-CPPFLAGS="${CPPFLAGS} ${CRYPTO_CPPFLAGS}"
-LDFLAGS="${LDFLAGS} ${CRYPTO_LDFLAGS}"
-LIBS="${LIBS} ${CRYPTO_LIBS}"
+CPPFLAGS="${CPPFLAGS} ${CRYPTO_CPPFLAGS} ${OPENTHREAD_CPPFLAGS}"
+LDFLAGS="${LDFLAGS} ${CRYPTO_LDFLAGS} ${OPENTHREAD_LDFLAGS}"
+LIBS="${LIBS} ${CRYPTO_LIBS} ${OPENTHREAD_LIBS}"
 
 # Add any code coverage CPPFLAGS, LDFLAGS, and LIBS
 
@@ -2321,6 +2393,10 @@ AC_MSG_NOTICE([
   mbedTLS compile flags                            : ${MBEDTLS_CPPFLAGS:--}
   mbedTLS link flags                               : ${MBEDTLS_LDFLAGS:--}
   mbedTLS link libraries                           : ${MBEDTLS_LIBS:--}
+  OpenThread source                                : ${nl_with_openthread}
+  OpenThread compile flags                         : ${OPENTHREAD_CPPFLAGS:--}
+  OpenThread link flags                            : ${OPENTHREAD_LDFLAGS:--}
+  OpenThread link libraries                        : ${OPENTHREAD_LIBS:--}
   OpenSSL source                                   : ${nl_with_openssl}
   OpenSSL compile flags                            : ${OPENSSL_CPPFLAGS:--}
   OpenSSL link flags                               : ${OPENSSL_LDFLAGS:--}
diff --git a/examples/lighting-app/nrf5/Makefile b/examples/lighting-app/nrf5/Makefile
index f2cc97e3bd1a85..56fa0a6fc30766 100644
--- a/examples/lighting-app/nrf5/Makefile
+++ b/examples/lighting-app/nrf5/Makefile
@@ -194,15 +194,9 @@ DEFINES = \
     NRF52840_XXAA \
     NRFX_PRS_ENABLED=0 \
     NRF_SD_BLE_API_VERSION=7 \
-    OPENTHREAD_CONFIG_COAP_API_ENABLE \
-    OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0 \
-    OPENTHREAD_CONFIG_FILE=\"openthread-config-wrap.h\" \
-    OPENTHREAD_FTD=1 \
     PRINTF_DISABLE_SUPPORT_EXPONENTIAL \
     S140 \
     SOFTDEVICE_PRESENT \
-    THREAD_EXAMPLE_COAP_SERVER=1 \
-    THREAD_EXAMPLE_FREERTOS=1 \
     UART0_ENABLED=0 \
     UART1_ENABLED=1 \
     USE_APP_CONFIG \
@@ -210,9 +204,12 @@ DEFINES = \
     __STACK_SIZE=8192 \
 
 LIBS = \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-cli-ftd.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-ftd.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-platform-utils.a \
+    -lopenthread-cli-ftd \
+    -lopenthread-ftd \
+    -lopenthread-platform-utils \
+    -lopenthread-nrf52840-transport \
+    -lopenthread-nrf52840-softdevice-sdk \
+    -lnordicsemi-nrf52840-radio-driver-softdevice \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_cc310.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_vanilla.a \
@@ -222,19 +219,6 @@ LIBS = \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_tls_vanilla.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_x509_vanilla.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libnrf_cc310_platform_0.9.1.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-nrf52840-softdevice-sdk.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_cc310.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libnordicsemi-nrf52840-radio-driver-softdevice.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_cc310_backend.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_vanilla_backend.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-platform-utils.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_base_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_tls_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_x509_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libnrf_cc310_platform_0.9.1.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-ftd.a \
 
 CFLAGS = \
     --specs=nano.specs
diff --git a/examples/lock-app/nrf5/Makefile b/examples/lock-app/nrf5/Makefile
index 0396de152b5361..ec385e33d1afdc 100644
--- a/examples/lock-app/nrf5/Makefile
+++ b/examples/lock-app/nrf5/Makefile
@@ -194,15 +194,9 @@ DEFINES = \
     NRF52840_XXAA \
     NRFX_PRS_ENABLED=0 \
     NRF_SD_BLE_API_VERSION=7 \
-    OPENTHREAD_CONFIG_COAP_API_ENABLE \
-    OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0 \
-    OPENTHREAD_CONFIG_FILE=\"openthread-config-wrap.h\" \
-    OPENTHREAD_FTD=1 \
     PRINTF_DISABLE_SUPPORT_EXPONENTIAL \
     S140 \
     SOFTDEVICE_PRESENT \
-    THREAD_EXAMPLE_COAP_SERVER=1 \
-    THREAD_EXAMPLE_FREERTOS=1 \
     UART0_ENABLED=0 \
     UART1_ENABLED=1 \
     USE_APP_CONFIG \
@@ -210,9 +204,12 @@ DEFINES = \
     __STACK_SIZE=8192 \
 
 LIBS = \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-cli-ftd.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-ftd.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-platform-utils.a \
+    -lopenthread-cli-ftd \
+    -lopenthread-ftd \
+    -lopenthread-platform-utils \
+    -lopenthread-nrf52840-transport \
+    -lopenthread-nrf52840-softdevice-sdk \
+    -lnordicsemi-nrf52840-radio-driver-softdevice \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_cc310.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_vanilla.a \
@@ -222,19 +219,6 @@ LIBS = \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_tls_vanilla.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_x509_vanilla.a \
     $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libnrf_cc310_platform_0.9.1.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-nrf52840-softdevice-sdk.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_cc310.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_glue_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libnordicsemi-nrf52840-radio-driver-softdevice.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_cc310_backend.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedcrypto_vanilla_backend.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-platform-utils.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_base_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_tls_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libmbedtls_x509_vanilla.a \
-    $(NRF5_SDK_ROOT)/external/openthread/nrf_security/lib/libnrf_cc310_platform_0.9.1.a \
-    $(NRF5_SDK_ROOT)/external/openthread/lib/nrf52840/gcc/libopenthread-ftd.a \
 
 CFLAGS = \
     --specs=nano.specs
diff --git a/third_party/Makefile.am b/third_party/Makefile.am
index dd4ee9dc53f745..6aa2b2d47fa745 100644
--- a/third_party/Makefile.am
+++ b/third_party/Makefile.am
@@ -44,7 +44,7 @@ DIST_SUBDIRS                                 = \
 # of the 'distclean' target. Consequently, we conditionally include
 # them in DIST_SUBDIRS on invocation of 'distclean-recursive'
 
-distclean-recursive: DIST_SUBDIRS += $(NLASSERT_SUBDIRS) $(NLFAULTINJECTION_SUBDIRS) $(NLIO_SUBDIRS) $(NLUNIT_TEST_SUBDIRS) $(MBEDTLS_SUBDIRS) $(OTBR_CLIENT_SUBDIRS)
+distclean-recursive: DIST_SUBDIRS += $(NLASSERT_SUBDIRS) $(NLFAULTINJECTION_SUBDIRS) $(NLIO_SUBDIRS) $(NLUNIT_TEST_SUBDIRS) $(MBEDTLS_SUBDIRS) $(OPENTHREAD_SUBDIRS) $(OTBR_CLIENT_SUBDIRS)
 
 # Always build (e.g. for 'make all') these subdirectories.
 #
@@ -58,6 +58,7 @@ SUBDIRS                                      = \
     $(NLIO_SUBDIRS)                            \
     $(NLUNIT_TEST_SUBDIRS)                     \
     $(MBEDTLS_SUBDIRS)                         \
+    $(OPENTHREAD_SUBDIRS)                      \
     $(OT_BR_POSIX_SUBDIRS)                     \
     $(NULL)
 
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
index 5f0e36eeb236a5..4806fa4d0dd454 160000
--- a/third_party/openthread/repo
+++ b/third_party/openthread/repo
@@ -1 +1 @@
-Subproject commit 5f0e36eeb236a507631e9c822e43f742b7b6738a
+Subproject commit 4806fa4d0dd454d05452c1dbf219c7fb7ff2d3fa

From 5861fcebdd5ff3f35548a59cb22d3f09a8cc378f Mon Sep 17 00:00:00 2001
From: Martin Turon <mturon@google.com>
Date: Tue, 14 Jul 2020 09:11:46 -0700
Subject: [PATCH 54/74] [shell] Add device layer commands: start, get, config.
 (#1574)

* [shell] Add device layer commands: start, get, config.

* [shell] add shell to default build.

* [shell] Strip out unneeded gni file.

* [shell] Simplified helpers for getting config fields.

* [shell] PR comment resolution.

* [shell] PR comment resolution. Add TODO(#1586) to stack large bufs.

* [shell] Fix #1586.

* [shell] add Manufacturer Device config.

* [shell] Delete unused linux config header.
---
 BUILD.gn                           |   1 +
 examples/shell/BUILD.gn            |   1 +
 examples/shell/cmd_device.cpp      | 508 +++++++++++++++++++++++++++++
 examples/shell/main.cpp            |   2 +
 examples/shell/standalone/Makefile |   1 +
 src/platform/BUILD.gn              |   2 +
 src/platform/Linux/args.gni        |   3 +-
 7 files changed, 516 insertions(+), 2 deletions(-)
 create mode 100644 examples/shell/cmd_device.cpp

diff --git a/BUILD.gn b/BUILD.gn
index 51964f737f22f7..51108f295081ed 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -60,6 +60,7 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
       deps += [
         "${chip_root}/src/qrcodetool",
         "${chip_root}/src/setup_payload",
+        "${chip_root}/examples/shell",
       ]
     }
   }
diff --git a/examples/shell/BUILD.gn b/examples/shell/BUILD.gn
index a3c5853f9bf7be..95239268380250 100644
--- a/examples/shell/BUILD.gn
+++ b/examples/shell/BUILD.gn
@@ -21,6 +21,7 @@ assert(chip_build_tools)
 executable("chip-shell") {
   sources = [
     "cmd_base64.cpp",
+    "cmd_device.cpp",
     "cmd_misc.cpp",
     "main.cpp",
   ]
diff --git a/examples/shell/cmd_device.cpp b/examples/shell/cmd_device.cpp
new file mode 100644
index 00000000000000..27601198150b0d
--- /dev/null
+++ b/examples/shell/cmd_device.cpp
@@ -0,0 +1,508 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+#include <core/CHIPCore.h>
+
+#if CONFIG_DEVICE_LAYER
+
+#include <platform/CHIPDeviceLayer.h>
+#include <shell/shell.h>
+#include <support/CHIPArgParser.hpp>
+#include <support/CHIPMem.h>
+#include <support/CodeUtils.h>
+
+using namespace chip;
+using namespace chip::Shell;
+using namespace chip::Platform;
+using namespace chip::DeviceLayer;
+using namespace chip::Logging;
+using namespace chip::ArgParser;
+
+static chip::Shell::Shell sShellDeviceSubcommands;
+
+int cmd_device_help_iterator(shell_command_t * command, void * arg)
+{
+    streamer_printf(streamer_get(), "  %-15s %s\n\r", command->cmd_name, command->cmd_help);
+    return 0;
+}
+
+int cmd_device_help(int argc, char ** argv)
+{
+    sShellDeviceSubcommands.ForEachCommand(cmd_device_help_iterator, NULL);
+    return 0;
+}
+
+int cmd_device_start(int argc, char ** argv)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+
+    VerifyOrExit(argc == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
+
+    streamer_printf(sout, "Init CHIP Stack\r\n");
+    error = PlatformMgr().InitChipStack();
+    SuccessOrExit(error);
+
+    streamer_printf(sout, "Starting Platform Manager Event Loop\r\n");
+    error = PlatformMgr().StartEventLoopTask();
+    SuccessOrExit(error);
+
+exit:
+    return error;
+}
+
+static CHIP_ERROR ConfigGetDone(streamer_t * sout, CHIP_ERROR error)
+{
+    if (error)
+    {
+        streamer_printf(sout, "<None>");
+    }
+    streamer_printf(sout, "\r\n");
+    return error;
+}
+
+static CHIP_ERROR ConfigGetVendorId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint16_t value16;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "VendorId:        ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetVendorId(value16));
+    streamer_printf(sout, "%04x", value16);
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetProductId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint16_t value16;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "ProductId:       ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetProductId(value16));
+    streamer_printf(sout, "%04x", value16);
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetProductRevision(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint16_t value16;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "ProductRevision: ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetProductRevision(value16));
+    streamer_printf(sout, "%04x", value16);
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetSerialNumber(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    char buf[ConfigurationManager::kMaxSerialNumberLength];
+    size_t bufSize;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "SerialNumber:    ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetSerialNumber(buf, sizeof(buf), bufSize));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(buf), bufSize);
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetDeviceId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint64_t value64;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "DeviceId:        ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetDeviceId(value64));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(&value64), sizeof(value64));
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetDeviceCert(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint8_t * certBuf = NULL;
+    size_t certLen;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "DeviceCert:      ");
+    }
+    // Determine the length of the device certificate.
+    error = ConfigurationMgr().GetDeviceCertificate((uint8_t *) NULL, 0, certLen);
+    SuccessOrExit(error);
+
+    // Fail if no certificate has been configured.
+    VerifyOrExit(certLen != 0, error = CHIP_ERROR_CERT_NOT_FOUND);
+
+    // Create a temporary buffer to hold the certificate.
+    certBuf = (uint8_t *) MemoryAlloc(certLen);
+    VerifyOrExit(certBuf != NULL, error = CHIP_ERROR_NO_MEMORY);
+
+    // Read the certificate
+    error = ConfigurationMgr().GetDeviceCertificate(certBuf, certLen, certLen);
+    SuccessOrExit(error);
+
+    streamer_print_hex(sout, const_cast<const uint8_t *>(certBuf), certLen);
+
+exit:
+    if (certBuf != NULL)
+    {
+        MemoryFree(certBuf);
+    }
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetDeviceCaCerts(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint8_t * certBuf = NULL;
+    size_t certLen;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "DeviceCaCerts:   ");
+    }
+    // Determine the length of the device certificate.
+    error = ConfigurationMgr().GetDeviceIntermediateCACerts((uint8_t *) NULL, 0, certLen);
+    SuccessOrExit(error);
+
+    // Fail if no certificate has been configured.
+    VerifyOrExit(certLen != 0, error = CHIP_ERROR_CERT_NOT_FOUND);
+
+    // Create a temporary buffer to hold the certificate.
+    certBuf = (uint8_t *) MemoryAlloc(certLen);
+    VerifyOrExit(certBuf != NULL, error = CHIP_ERROR_NO_MEMORY);
+
+    // Read the certificate
+    error = ConfigurationMgr().GetDeviceIntermediateCACerts(certBuf, certLen, certLen);
+    SuccessOrExit(error);
+
+    streamer_print_hex(sout, const_cast<const uint8_t *>(certBuf), certLen);
+
+exit:
+    if (certBuf != NULL)
+    {
+        MemoryFree(certBuf);
+    }
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetManufacturerDeviceId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint64_t value64;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "MfrDeviceId:     ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetManufacturerDeviceId(value64));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(&value64), sizeof(value64));
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetManufacturerDeviceCert(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint8_t * certBuf = NULL;
+    size_t certLen;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "MfrDeviceCert:   ");
+    }
+    // Determine the length of the device certificate.
+    error = ConfigurationMgr().GetManufacturerDeviceCertificate((uint8_t *) NULL, 0, certLen);
+    SuccessOrExit(error);
+
+    // Fail if no certificate has been configured.
+    VerifyOrExit(certLen != 0, error = CHIP_ERROR_CERT_NOT_FOUND);
+
+    // Create a temporary buffer to hold the certificate.
+    certBuf = (uint8_t *) MemoryAlloc(certLen);
+    VerifyOrExit(certBuf != NULL, error = CHIP_ERROR_NO_MEMORY);
+
+    // Read the certificate
+    error = ConfigurationMgr().GetManufacturerDeviceCertificate(certBuf, certLen, certLen);
+    SuccessOrExit(error);
+
+    streamer_print_hex(sout, const_cast<const uint8_t *>(certBuf), certLen);
+
+exit:
+    if (certBuf != NULL)
+    {
+        MemoryFree(certBuf);
+    }
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetManufacturerDeviceCaCerts(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint8_t * certBuf = NULL;
+    size_t certLen;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "MfgDeviceCaCerts:");
+    }
+    // Determine the length of the device certificate.
+    error = ConfigurationMgr().GetManufacturerDeviceIntermediateCACerts((uint8_t *) NULL, 0, certLen);
+    SuccessOrExit(error);
+
+    // Fail if no certificate has been configured.
+    VerifyOrExit(certLen != 0, error = CHIP_ERROR_CERT_NOT_FOUND);
+
+    // Create a temporary buffer to hold the certificate.
+    certBuf = (uint8_t *) MemoryAlloc(certLen);
+    VerifyOrExit(certBuf != NULL, error = CHIP_ERROR_NO_MEMORY);
+
+    // Read the certificate
+    error = ConfigurationMgr().GetManufacturerDeviceIntermediateCACerts(certBuf, certLen, certLen);
+    SuccessOrExit(error);
+
+    streamer_print_hex(sout, const_cast<const uint8_t *>(certBuf), certLen);
+
+exit:
+    if (certBuf != NULL)
+    {
+        MemoryFree(certBuf);
+    }
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetPairingCode(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    char buf[ConfigurationManager::kMaxPairingCodeLength];
+    size_t bufSize;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "PairingCode:     ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetPairingCode(buf, sizeof(buf), bufSize));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(buf), bufSize);
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetServiceId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint64_t value64;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "ServiceId:       ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetServiceId(value64));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(&value64), sizeof(value64));
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+static CHIP_ERROR ConfigGetFabricId(bool printHeader)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+    uint64_t value64;
+
+    if (printHeader)
+    {
+        streamer_printf(sout, "FabricId:        ");
+    }
+    SuccessOrExit(error = ConfigurationMgr().GetFabricId(value64));
+    streamer_print_hex(sout, reinterpret_cast<const uint8_t *>(&value64), sizeof(value64));
+
+exit:
+    return ConfigGetDone(sout, error);
+}
+
+int cmd_device_config(int argc, char ** argv)
+{
+    CHIP_ERROR error = CHIP_NO_ERROR;
+
+    VerifyOrExit(argc == 0, error = CHIP_ERROR_INVALID_ARGUMENT);
+
+    error |= ConfigGetVendorId(true);
+    error |= ConfigGetProductId(true);
+    error |= ConfigGetProductRevision(true);
+    error |= ConfigGetSerialNumber(true);
+
+    error |= ConfigGetServiceId(true);
+    error |= ConfigGetFabricId(true);
+    error |= ConfigGetPairingCode(true);
+
+    error |= ConfigGetDeviceId(true);
+    error |= ConfigGetDeviceCert(true);
+    error |= ConfigGetDeviceCaCerts(true);
+
+    error |= ConfigGetManufacturerDeviceId(true);
+    error |= ConfigGetManufacturerDeviceCert(true);
+    error |= ConfigGetManufacturerDeviceCaCerts(true);
+
+exit:
+    return (error) ? CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND : CHIP_NO_ERROR;
+}
+
+int cmd_device_get(int argc, char ** argv)
+{
+    CHIP_ERROR error  = CHIP_NO_ERROR;
+    streamer_t * sout = streamer_get();
+
+    if (argc == 0)
+    {
+        return cmd_device_config(argc, argv);
+    }
+
+    if (strcmp(argv[0], "vendorid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetVendorId(false));
+    }
+    else if (strcmp(argv[0], "productid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetProductId(false));
+    }
+    else if (strcmp(argv[0], "productrev") == 0)
+    {
+        SuccessOrExit(error = ConfigGetProductRevision(false));
+    }
+    else if (strcmp(argv[0], "serial") == 0)
+    {
+        SuccessOrExit(error = ConfigGetSerialNumber(false));
+    }
+    else if (strcmp(argv[0], "deviceid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetDeviceId(false));
+    }
+    else if (strcmp(argv[0], "cert") == 0)
+    {
+        SuccessOrExit(error = ConfigGetDeviceCert(false));
+    }
+    else if (strcmp(argv[0], "cacerts") == 0)
+    {
+        SuccessOrExit(error = ConfigGetDeviceCaCerts(false));
+    }
+    else if (strcmp(argv[0], "mfrdeviceid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetManufacturerDeviceId(false));
+    }
+    else if (strcmp(argv[0], "mfrcert") == 0)
+    {
+        SuccessOrExit(error = ConfigGetManufacturerDeviceCert(false));
+    }
+    else if (strcmp(argv[0], "mfrcacerts") == 0)
+    {
+        SuccessOrExit(error = ConfigGetManufacturerDeviceCaCerts(false));
+    }
+    else if (strcmp(argv[0], "pairingcode") == 0)
+    {
+        SuccessOrExit(error = ConfigGetPairingCode(false));
+    }
+    else if (strcmp(argv[0], "serviceid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetServiceId(false));
+    }
+    else if (strcmp(argv[0], "fabricid") == 0)
+    {
+        SuccessOrExit(error = ConfigGetFabricId(false));
+    }
+    else
+    {
+        ExitNow(error = CHIP_ERROR_INVALID_ARGUMENT);
+    }
+
+exit:
+    return error;
+}
+
+int cmd_device_dispatch(int argc, char ** argv)
+{
+    CHIP_ERROR error = CHIP_NO_ERROR;
+
+    VerifyOrExit(argc > 0, error = CHIP_ERROR_INVALID_ARGUMENT);
+
+    error = sShellDeviceSubcommands.ExecCommand(argc, argv);
+
+exit:
+    return error;
+}
+
+static const shell_command_t cmds_base64_root = { &cmd_device_dispatch, "device", "Device Layer commands" };
+
+/// Subcommands for root command: `base64 <subcommand>`
+static const shell_command_t cmds_device[] = {
+    { &cmd_device_help, "help", "Usage: device <subcommand>" },
+    { &cmd_device_start, "start", "Start the device layer. Usage: device start" },
+    { &cmd_device_get, "get", "Get configuration value. Usage: device get <param_name>" },
+    { &cmd_device_config, "config", "Dump entire configuration of device. Usage: device dump" },
+};
+
+#endif // CONFIG_DEVICE_LAYER
+
+void cmd_device_init(void)
+{
+#if CONFIG_DEVICE_LAYER
+    // Register `device` subcommands with the local shell dispatcher.
+    sShellDeviceSubcommands.RegisterCommands(cmds_device, ARRAY_SIZE(cmds_device));
+
+    // Register the root `base64` command with the top-level shell.
+    shell_register(&cmds_base64_root, 1);
+#endif // CONFIG_DEVICE_LAYER
+}
diff --git a/examples/shell/main.cpp b/examples/shell/main.cpp
index 1ff210c208b313..ddd6cc576a72c6 100644
--- a/examples/shell/main.cpp
+++ b/examples/shell/main.cpp
@@ -34,11 +34,13 @@ using namespace chip::Shell;
 
 void cmd_misc_init();
 void cmd_base64_init();
+void cmd_device_init();
 
 int main(void)
 {
     cmd_misc_init();
     cmd_base64_init();
+    cmd_device_init();
 
     shell_task(NULL);
 }
diff --git a/examples/shell/standalone/Makefile b/examples/shell/standalone/Makefile
index f55ae6057d5b50..d62ff73fe03460 100644
--- a/examples/shell/standalone/Makefile
+++ b/examples/shell/standalone/Makefile
@@ -38,6 +38,7 @@ SRCS = \
     $(PROJECT_ROOT)/main.cpp \
     $(PROJECT_ROOT)/cmd_misc.cpp \
     $(PROJECT_ROOT)/cmd_base64.cpp \
+    $(PROJECT_ROOT)/cmd_device.cpp \
     $(NULL)
 
 INC_DIRS = \
diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
index 3962e970d01e75..cca15ad3850ed4 100644
--- a/src/platform/BUILD.gn
+++ b/src/platform/BUILD.gn
@@ -39,6 +39,7 @@ if (device_platform != "none") {
 
     if (device_platform == "linux") {
       defines += [
+        "CONFIG_DEVICE_LAYER=1",
         "CHIP_DEVICE_LAYER_TARGET_LINUX=1",
         "CHIP_DEVICE_LAYER_TARGET=Linux",
       ]
@@ -47,6 +48,7 @@ if (device_platform != "none") {
     }
     if (device_platform == "nrf5") {
       defines += [
+        "CONFIG_DEVICE_LAYER=1",
         "CHIP_DEVICE_LAYER_TARGET_NRF5=1",
         "CHIP_DEVICE_LAYER_TARGET=nRF5",
       ]
diff --git a/src/platform/Linux/args.gni b/src/platform/Linux/args.gni
index 31824728d53f76..0cbe8dfdf87e39 100644
--- a/src/platform/Linux/args.gni
+++ b/src/platform/Linux/args.gni
@@ -15,8 +15,7 @@
 device_platform = "linux"
 
 ble_platform_config_include = "<platform/Linux/BlePlatformConfig.h>"
-chip_device_platform_config_include =
-    "<platform/Linux/CHIPDevicePlatformConfig.h>"
+chip_device_platform_config_include = "<platform/Linux/CHIPDevicePlatformConfig.h>"
 chip_platform_config_include = "<platform/Linux/CHIPPlatformConfig.h>"
 inet_platform_config_include = "<platform/Linux/InetPlatformConfig.h>"
 system_platform_config_include = "<platform/Linux/SystemPlatformConfig.h>"

From ef9b7cf31d723d04dfdc21bd06edd213994f63a5 Mon Sep 17 00:00:00 2001
From: Rob Walker <robert_g_walker@apple.com>
Date: Tue, 14 Jul 2020 13:49:27 -0700
Subject: [PATCH 55/74] dont need bsdtar (#1598)

---
 .devcontainer/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ad808d72571692..0b185ee22518d1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get -fy install git vim emacs sudo \
     iproute2 procps lsb-release \
     bash-completion \
     build-essential cmake cppcheck valgrind \
-    wget curl telnet bsdtar \
+    wget curl telnet \
     docker.io
 RUN groupadd -g $USER_GID $USERNAME
 RUN useradd -s /bin/bash -u $USER_UID -g $USER_GID -G docker -m $USERNAME
@@ -27,7 +27,8 @@ RUN chmod 0440 /etc/sudoers.d/$USERNAME
 
 RUN mkdir -p /var/downloads
 RUN cd /var/downloads
-RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix | bsdtar -xvf - extension
+RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix > extension.zip
+RUN unzip extension.zip
 RUN mkdir -p /home/$USERNAME/.vscode-server/extensions
 RUN mv extension /home/$USERNAME/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
 RUN mkdir -p /home/$USERNAME/bin

From f8158253c0f5339cf783ac3ac23c3abc46e5a0ff Mon Sep 17 00:00:00 2001
From: Martin Turon <mturon@google.com>
Date: Tue, 14 Jul 2020 14:05:49 -0700
Subject: [PATCH 56/74] [shell] Add documentation for CHIP shell commands.
 (#1596)

---
 examples/shell/README.md        | 116 ++++++++++++++++++++++++++++++++
 examples/shell/README_DEVICE.md |  83 +++++++++++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 examples/shell/README.md
 create mode 100644 examples/shell/README_DEVICE.md

diff --git a/examples/shell/README.md b/examples/shell/README.md
new file mode 100644
index 00000000000000..30ff5783f579fe
--- /dev/null
+++ b/examples/shell/README.md
@@ -0,0 +1,116 @@
+# CHIP Shell Reference
+
+The `chip-shell` firmware exposes configuration and management APIs via a
+command line interface (CLI). Use the shell CLI to experiment with CHIP
+interactively, which can also be used with additional application code. The CHIP
+functional test scripts use the shell CLI to execute test cases.
+
+## Separator and escaping characters
+
+The whitespace character (`' '`) is used to delimit the command name and the
+different arguments, together with tab (`'\t'`) and new line characters (`'\r'`,
+`'\n'`).
+
+Some arguments might require to accept whitespaces on them. For those cases the
+backslash character (`'\'`) can be used to escape separators or the backslash
+itself.
+
+Example:
+
+```bash
+> networkname Test\ Network
+Done
+> networkname
+Test Network
+Done
+>
+```
+
+## CHIP Shell Command List
+
+-   [base64](#base64-decode-b64_string)
+-   [device](README_DEVICE.md)
+-   [echo](#echo-string)
+-   [exit](#exit)
+-   [help](#help)
+-   [rand](#rand)
+-   [version](#version)
+
+## CHIP Shell Command Details
+
+### help
+
+Display a list of all top-level commands supported and a brief description.
+
+```bash
+> help
+  echo            Echo back provided inputs
+  log             Logging utilities
+  rand            Random number utilities
+  base64          Base64 encode / decode utilities
+  device          Device Layer commands
+  exit            Exit the shell application
+  help            List out all top level commands
+  version         Output the software version
+Done
+```
+
+### base64 decode \<b64_string\>
+
+Decode the given base64 string into hex.
+
+```bash
+> base64 decode EjQ=
+1234
+Done
+```
+
+### base64 encode \<hex_string\>
+
+Decode the given hex string into base64.
+
+```bash
+> base64 encode 1234
+EjQ=
+Done
+```
+
+### echo \<string\>
+
+Echo back the provided string to the terminal.
+
+```bash
+> echo hello
+hello
+Done
+```
+
+### exit
+
+Exit the shell terminal. On an embedded system this may trigger a watchdog
+reset.
+
+```bash
+> exit
+Goodbye
+```
+
+### rand
+
+Output a single byte random number.
+
+```bash
+> rand
+103
+Done
+```
+
+### version
+
+Output the version of the CHIP stack.
+
+```bash
+> version
+CHIP 0.0.g54591338-dirty
+Done
+```
diff --git a/examples/shell/README_DEVICE.md b/examples/shell/README_DEVICE.md
new file mode 100644
index 00000000000000..1d9db72f218bad
--- /dev/null
+++ b/examples/shell/README_DEVICE.md
@@ -0,0 +1,83 @@
+# CHIP Shell - Device Layer module
+
+The chip::DeviceLayer APIs may be invoked via the CHIP Shell CLI.
+
+## Command List
+
+-   [help](#help)
+-   [config](#config)
+-   [get](#get-parameter)
+-   [start](#start)
+
+## Command Details
+
+### help
+
+List the Device CLI commands.
+
+```bash
+> device help
+  help            Usage: device <subcommand>
+  start           Start the device layer. Usage: device start
+  get             Get configuration value. Usage: device get <param_name>
+  config          Dump entire configuration of device. Usage: device dump
+Done
+```
+
+### config
+
+Dump the configuration of the device.
+
+```bash
+> device config
+VendorId:        235a
+ProductId:       feff
+ProductRevision: 0001
+SerialNumber:    <None>
+ServiceId:       <None>
+FabricId:        <None>
+PairingCode:     <None>
+DeviceId:        <None>
+DeviceCert:      <None>
+DeviceCaCerts:   <None>
+MfrDeviceId:     <None>
+MfrDeviceCert:   <None>
+MfgDeviceCaCerts:<None>
+```
+
+### get \<parameter\>
+
+-   parameter: name of field to query
+
+Where valid parameter names include:
+
+-   vendorid: Vendor Identifier
+-   productid: Product Identifier
+-   productrev: Product Revision
+-   serial: Serial Number
+-   deviceid: Device Identification Number
+-   cert: Device Certificate
+-   cacerts: Device CA Certificates
+-   mfrdeviceid: Manufacturer Device Identification Number
+-   mfrcert: Manufacturer Device Certificate
+-   mfrcacerts: Manufacturer Device CA Certs
+-   pairingcode: Pairing Code
+-   serviceid: Service Identifier
+-   fabricid: Fabric Identifier
+
+```bash
+> device get vendorid
+235a
+Done
+```
+
+### start
+
+Initialize the chip stack and start the device layer event loop.
+
+```bash
+> device start
+Init CHIP Stack
+Starting Platform Manager Event Loop
+Done
+```

From 9987ae5e9a0585d3e744b44c47d0874ed7f17f9f Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Tue, 14 Jul 2020 17:06:39 -0400
Subject: [PATCH 57/74] Remove recursive mutex & fix unbalanced locking in
 TestPlatformMgr (#1587)

We shouldn't use recursive mutexes for synchronization as they greatly
complicate analysis and maintenance.
---
 .../internal/GenericPlatformManagerImpl_POSIX.ipp         | 8 +-------
 src/platform/tests/TestPlatformMgr.cpp                    | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
index 2d2437d8d5ca8a..c4f6257550ee4a 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.ipp
@@ -53,13 +53,7 @@ CHIP_ERROR GenericPlatformManagerImpl_POSIX<ImplClass>::_InitChipStack(void)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
-#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-    mChipStackLock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
-#elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
-    mChipStackLock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-#else
-#error "No defined static initializer for POSIX Threads recursive mutex!"
-#endif // defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+    mChipStackLock = PTHREAD_MUTEX_INITIALIZER;
 
     // Initialize the Configuration Manager object.
     err = ConfigurationMgr().Init();
diff --git a/src/platform/tests/TestPlatformMgr.cpp b/src/platform/tests/TestPlatformMgr.cpp
index ed255a036cb3ae..0aa63a89e77a85 100644
--- a/src/platform/tests/TestPlatformMgr.cpp
+++ b/src/platform/tests/TestPlatformMgr.cpp
@@ -59,12 +59,8 @@ static void TestPlatformMgr_StartEventLoopTask(nlTestSuite * inSuite, void * inC
 static void TestPlatformMgr_TryLockChipStack(nlTestSuite * inSuite, void * inContext)
 {
     bool locked = PlatformMgr().TryLockChipStack();
-    NL_TEST_ASSERT(inSuite, locked);
-
-    PlatformMgr().LockChipStack();
-    locked = PlatformMgr().TryLockChipStack();
-    PlatformMgr().UnlockChipStack();
-    NL_TEST_ASSERT(inSuite, locked);
+    if (locked)
+        PlatformMgr().UnlockChipStack();
 }
 
 static int sEventRecieved = 0;

From 9f920f4dc4b342dd547a468b98b6afec13f1f9b1 Mon Sep 17 00:00:00 2001
From: Martin Turon <mturon@google.com>
Date: Wed, 15 Jul 2020 06:15:26 -0700
Subject: [PATCH 58/74] [shell] Add handling of escape and tabs. (#1604)

* [shell] Add handling of escape and tabs.

* [shell] Add unit tests for new escape handling.

* [shell] Fix typo in tests.  Posted #1605.
---
 src/lib/shell/shell.cpp           | 26 +++++++++++++++++++++++---
 src/lib/shell/tests/TestShell.cpp |  3 +++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/lib/shell/shell.cpp b/src/lib/shell/shell.cpp
index ec162533f03867..ff6b88347f4f58 100644
--- a/src/lib/shell/shell.cpp
+++ b/src/lib/shell/shell.cpp
@@ -80,7 +80,7 @@ int shell_line_read(char * buffer, size_t max)
                 }
                 break;
             default:
-                if (isprint((int) *inptr))
+                if (isprint((int) *inptr) || *inptr == '\t')
                 {
                     streamer_printf(streamer_get(), "%c", *inptr);
                 }
@@ -147,6 +147,21 @@ int Shell::ExecCommand(int argc, char * argv[])
     return retval;
 }
 
+static bool IsSeparator(char aChar)
+{
+    return (aChar == ' ') || (aChar == '\t') || (aChar == '\r') || (aChar == '\n');
+}
+
+static bool IsEscape(char aChar)
+{
+    return (aChar == '\\');
+}
+
+static bool IsEscapable(char aChar)
+{
+    return IsSeparator(aChar) || IsEscape(aChar);
+}
+
 int Shell::TokenizeLine(char * buffer, char ** tokens, int max_tokens)
 {
     int len    = strlen(buffer);
@@ -166,10 +181,15 @@ int Shell::TokenizeLine(char * buffer, char ** tokens, int max_tokens)
 
     for (; i < len && cursor < max_tokens; i++)
     {
-        if (buffer[i] == ' ')
+        if (IsEscape(buffer[i]) && IsEscapable(buffer[i + 1]))
+        {
+            // include the null terminator: strlen(cmd) = strlen(cmd + 1) + 1
+            memmove(&buffer[i], &buffer[i + 1], strlen(&buffer[i]));
+        }
+        else if (IsSeparator(buffer[i]))
         {
             buffer[i] = 0;
-            if (buffer[i + 1] != ' ')
+            if (!IsSeparator(buffer[i + 1]))
             {
                 tokens[cursor++] = &buffer[i + 1];
             }
diff --git a/src/lib/shell/tests/TestShell.cpp b/src/lib/shell/tests/TestShell.cpp
index bc46e687e732fa..26a8175a5587f6 100644
--- a/src/lib/shell/tests/TestShell.cpp
+++ b/src/lib/shell/tests/TestShell.cpp
@@ -47,6 +47,9 @@ static const struct test_shell_vector test_vector_shell_tokenizer[] = {
     { .line = " leading space", .argv = (const char *[]){ "leading", "space" } },
     { .line = "trailing space ", .argv = (const char *[]){ "trailing", "space", "" } },
     { .line = "no_space", .argv = (const char *[]){ "no_space" } },
+    { .line = "escaped\\ space", .argv = (const char *[]){ "escaped space" } },
+    { .line = "escape\\\\", .argv = (const char *[]){ "escape\\" } },
+    { .line = "extended\\ escaped\\ space and\\ more", .argv = (const char *[]){ "extended escaped space", "and more" } },
     { .line = " ", .argv = (const char *[]){ "" } },
     { .line = "", .argv = (const char *[]){} },
 };

From 926adda55a79eef3a21aed2e6aaefe497be434ea Mon Sep 17 00:00:00 2001
From: Yufeng Wang <44623591+yufengwangca@users.noreply.github.com>
Date: Wed, 15 Jul 2020 07:01:51 -0700
Subject: [PATCH 59/74] [linux] Add GDBus support in PlatformMgr to drive DBUS
 communication. (#1557)

* [linux] Add GDBus support in PlatformMgr to drive DBUS communication.
* Add GDBus support in PlatformMgr to drive DBUS: Thread, BLE, WiFi.
* Add dedicated I/O thread for DBUS.

* Define build flag CHIP_WITH_GIO based on if gio-2.0 lib is available
---
 configure.ac                               | 20 ++++++++++++++++
 src/platform/Linux/PlatformManagerImpl.cpp | 28 ++++++++++++++++++++++
 src/platform/Linux/PlatformManagerImpl.h   | 19 +++++++++++++--
 src/platform/Makefile.am                   |  1 +
 src/platform/tests/Makefile.am             | 17 +++++++++----
 5 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index bc493a56d2174b..788e0afb7639f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1998,6 +1998,25 @@ if test "${CHIP_DEVICE_LAYER_TARGET_LINUX}" = 1; then
     )
 fi
 
+#
+#
+# GIO
+#
+
+if test "${CHIP_DEVICE_LAYER_TARGET_LINUX}" = 1; then
+    PKG_CHECK_MODULES([GIO], [gio-2.0])
+
+    # Check for GIO library is available.
+    AC_CHECK_LIB([gio-2.0], [g_bus_get_sync],
+    [
+        AC_DEFINE([CHIP_WITH_GIO], [1], [Define to 1 to build CHIP with GIO])
+    ],
+    [
+        AC_DEFINE([CHIP_WITH_GIO], [0], [Define to 0 to build CHIP without GIO])
+    ]
+    )
+fi
+
 #
 # Sockets
 #
@@ -2428,6 +2447,7 @@ AC_MSG_NOTICE([
   PThreads compile flags                           : ${PTHREAD_CFLAGS:--}
   PThreads link libraries                          : ${PTHREAD_LIBS:--}
   IniPP compile flags                              : ${INIPP_CPPFLAGS:--}
+  GIO compile flags                                : ${GIO_CFLAGS:--}
   C Preprocessor                                   : ${CPP}
   C Compiler                                       : ${CC}
   C++ Preprocessor                                 : ${CXXCPP}
diff --git a/src/platform/Linux/PlatformManagerImpl.cpp b/src/platform/Linux/PlatformManagerImpl.cpp
index d4f6a1d892f2dd..6a8be2e5438a92 100644
--- a/src/platform/Linux/PlatformManagerImpl.cpp
+++ b/src/platform/Linux/PlatformManagerImpl.cpp
@@ -27,15 +27,36 @@
 #include <platform/PlatformManager.h>
 #include <platform/internal/GenericPlatformManagerImpl_POSIX.ipp>
 
+#include <thread>
+
 namespace chip {
 namespace DeviceLayer {
 
 PlatformManagerImpl PlatformManagerImpl::sInstance;
 
+#if CHIP_WITH_GIO
+static void GDBus_Thread()
+{
+    GMainLoop * loop = g_main_loop_new(nullptr, false);
+
+    g_main_loop_run(loop);
+    g_main_loop_unref(loop);
+}
+#endif
+
 CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     CHIP_ERROR err;
 
+#if CHIP_WITH_GIO
+    GError * error = NULL;
+
+    this->mpGDBusConnection = UniqueGDBusConnection(g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error));
+
+    std::thread gdbusThread(GDBus_Thread);
+    gdbusThread.detach();
+#endif
+
     // Initialize the configuration system.
     err = Internal::PosixConfig::Init();
     SuccessOrExit(err);
@@ -49,5 +70,12 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
     return err;
 }
 
+#if CHIP_WITH_GIO
+GDBusConnection * PlatformManagerImpl::GetGDBusConnection()
+{
+    return this->mpGDBusConnection.get();
+}
+#endif
+
 } // namespace DeviceLayer
 } // namespace chip
diff --git a/src/platform/Linux/PlatformManagerImpl.h b/src/platform/Linux/PlatformManagerImpl.h
index 355f51f9a20bbf..39cc3840e8664a 100644
--- a/src/platform/Linux/PlatformManagerImpl.h
+++ b/src/platform/Linux/PlatformManagerImpl.h
@@ -24,8 +24,13 @@
 #ifndef PLATFORM_MANAGER_IMPL_H
 #define PLATFORM_MANAGER_IMPL_H
 
+#include <memory>
 #include <platform/internal/GenericPlatformManagerImpl_POSIX.h>
 
+#if CHIP_WITH_GIO
+#include <gio/gio.h>
+#endif
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -44,8 +49,9 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
 
 public:
     // ===== Platform-specific members that may be accessed directly by the application.
-
-    /* none so far */
+#if CHIP_WITH_GIO
+    GDBusConnection * GetGDBusConnection();
+#endif
 
 private:
     // ===== Methods that implement the PlatformManager abstract interface.
@@ -59,6 +65,15 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     friend class Internal::BLEManagerImpl;
 
     static PlatformManagerImpl sInstance;
+
+#if CHIP_WITH_GIO
+    struct GDBusConnectionDeleter
+    {
+        void operator()(GDBusConnection * conn) { g_object_unref(conn); }
+    };
+    using UniqueGDBusConnection = std::unique_ptr<GDBusConnection, GDBusConnectionDeleter>;
+    UniqueGDBusConnection mpGDBusConnection;
+#endif
 };
 
 /**
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
index dbc8b725b9f76f..2acb4e2716c317 100644
--- a/src/platform/Makefile.am
+++ b/src/platform/Makefile.am
@@ -154,6 +154,7 @@ if CHIP_DEVICE_LAYER_TARGET_LINUX
 SUBDIRS                                += tests
 
 libDeviceLayer_a_CPPFLAGS              += \
+    $(GIO_CFLAGS)                         \
     $(INIPP_CPPFLAGS)                     \
     $(NULL)
 
diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 02cae2222929cc..0f54d8d2bc56d1 100644
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -69,14 +69,19 @@ AM_CPPFLAGS                                    = \
     $(NULL)
 
 if CHIP_DEVICE_LAYER_TARGET_LINUX
+AM_CPPFLAGS                                   += \
+    $(GIO_CFLAGS)                                \
+    $(NULL)
+
 if CHIP_WITH_OT_BR_POSIX
 AM_CPPFLAGS                                   += \
     $(DBUS_CFLAGS)                               \
     $(OT_BR_POSIX_CPPFLAGS)                     \
     $(NULL)
 libPlatformTests_a_SOURCES += TestThreadStackMgr.cpp
-endif
-endif
+endif # CHIP_WITH_OT_BR_POSIX
+endif # CHIP_DEVICE_LAYER_TARGET_LINUX
+
 
 CHIP_LDADD                                      = \
     $(top_builddir)/src/platform/libDeviceLayer.a \
@@ -86,13 +91,17 @@ CHIP_LDADD                                      = \
     $(NULL)
 
 if CHIP_DEVICE_LAYER_TARGET_LINUX
+CHIP_LDADD                                    += \
+    $(GIO_CFLAGS) $(GIO_LIBS)                    \
+    $(NULL)
+
 if CHIP_WITH_OT_BR_POSIX
 CHIP_LDADD                                    += \
     $(DBUS_LIBS)                                 \
     $(OT_BR_POSIX_LDFLAGS) $(OT_BR_POSIX_LIBS) \
     $(NULL)
-endif
-endif
+endif # CHIP_WITH_OT_BR_POSIX
+endif # CHIP_DEVICE_LAYER_TARGET_LINUX
 
 COMMON_LDADD                                          = \
     libPlatformTests.a                                  \

From b5725f327c059a92d8edf25e488697d27f72fcb2 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <44623591+yufengwangca@users.noreply.github.com>
Date: Thu, 16 Jul 2020 10:24:53 -0700
Subject: [PATCH 60/74] [linux] Use new chip SHA256 class to re-implement CHIP
 provisioning HASH (#1564)

* SHA256 class for CHIP is merged. Replace legacy SHA256 with chip::Crypto::Hash_SHA256_stream
---
 src/crypto/CHIPCryptoPAL.h                     |  7 +++++++
 src/crypto/CHIPCryptoPALOpenSSL.cpp            |  5 +++++
 src/crypto/CHIPCryptoPALmbedTLS.cpp            |  5 +++++
 .../GenericConfigurationManagerImpl.ipp        | 18 +++++++++++-------
 src/platform/tests/Makefile.am                 |  1 +
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/crypto/CHIPCryptoPAL.h b/src/crypto/CHIPCryptoPAL.h
index 3ae6cef065b997..22b4c5619521ba 100644
--- a/src/crypto/CHIPCryptoPAL.h
+++ b/src/crypto/CHIPCryptoPAL.h
@@ -215,6 +215,13 @@ CHIP_ERROR add_entropy_source(entropy_source fn_source, void * p_source, size_t
 CHIP_ERROR pbkdf2_sha256(const unsigned char * password, size_t plen, const unsigned char * salt, size_t slen,
                          unsigned int iteration_count, uint32_t key_length, unsigned char * output);
 
+/** @brief Clears the first `len` bytes of memory area `buf`.
+ * @param buf Pointer to a memory buffer holding secret data that should be cleared.
+ * @param len Specifies secret data size in bytes.
+ * @return void
+ **/
+void ClearSecretData(uint8_t * buf, uint32_t len);
+
 } // namespace Crypto
 } // namespace chip
 
diff --git a/src/crypto/CHIPCryptoPALOpenSSL.cpp b/src/crypto/CHIPCryptoPALOpenSSL.cpp
index 0c4e70c6cf2566..498502170b4a02 100644
--- a/src/crypto/CHIPCryptoPALOpenSSL.cpp
+++ b/src/crypto/CHIPCryptoPALOpenSSL.cpp
@@ -776,5 +776,10 @@ CHIP_ERROR ECDH_derive_secret(const unsigned char * remote_public_key, const siz
     return error;
 }
 
+void ClearSecretData(uint8_t * buf, uint32_t len)
+{
+    memset(buf, 0, len);
+}
+
 } // namespace Crypto
 } // namespace chip
diff --git a/src/crypto/CHIPCryptoPALmbedTLS.cpp b/src/crypto/CHIPCryptoPALmbedTLS.cpp
index 6328d923f77c85..acec89fe5a6711 100644
--- a/src/crypto/CHIPCryptoPALmbedTLS.cpp
+++ b/src/crypto/CHIPCryptoPALmbedTLS.cpp
@@ -497,5 +497,10 @@ CHIP_ERROR ECDH_derive_secret(const unsigned char * remote_public_key, const siz
     return error;
 }
 
+void ClearSecretData(uint8_t * buf, uint32_t len)
+{
+    memset(buf, 0, len);
+}
+
 } // namespace Crypto
 } // namespace chip
diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
index eb108df2aa6c6f..665720c1b8146b 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.ipp
@@ -31,11 +31,16 @@
 #include <platform/internal/GenericConfigurationManagerImpl.h>
 #include <support/Base64.h>
 #include <support/CodeUtils.h>
+#include <support/CHIPMem.h>
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
 #include <platform/ThreadStackManager.h>
 #endif
 
+#if CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH
+#include <crypto/CHIPCryptoPAL.h>
+#endif
+
 namespace chip {
 namespace DeviceLayer {
 namespace Internal {
@@ -94,7 +99,7 @@ CHIP_ERROR GenericConfigurationManagerImpl<ImplClass>::_ConfigureChipStack()
 
 #if CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH
     {
-        uint8_t provHash[Platform::Security::SHA256::kHashLength];
+        uint8_t provHash[chip::Crypto::kSHA256_Hash_Length];
         char provHashBase64[BASE64_ENCODED_LEN(sizeof(provHash)) + 1];
         err = Impl()->_ComputeProvisioningHash(provHash, sizeof(provHash));
         if (err == CHIP_NO_ERROR)
@@ -821,15 +826,14 @@ CHIP_ERROR GenericConfigurationManagerImpl<ImplClass>::_ComputeProvisioningHash(
     CHIP_ERROR err = CHIP_NO_ERROR;
 
 #if CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH
-    using HashAlgo = Platform::Security::SHA256;
+    using HashAlgo = chip::Crypto::Hash_SHA256_stream;
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
     HashAlgo hash;
     uint8_t * dataBuf = NULL;
     size_t dataBufSize;
     constexpr uint16_t kLenFieldLen = 4; // 4 hex characters
 
-    VerifyOrExit(hashBufSize >= HashAlgo::kHashLength, err = CHIP_ERROR_BUFFER_TOO_SMALL);
+    VerifyOrExit(hashBufSize >= chip::Crypto::kSHA256_Hash_Length, err = CHIP_ERROR_BUFFER_TOO_SMALL);
 
     // Compute a hash of the device's provisioning data.  The generated hash value confirms to the form
     // described in the CHIP Chip: Factory Provisioning Specification.
@@ -902,7 +906,7 @@ CHIP_ERROR GenericConfigurationManagerImpl<ImplClass>::_ComputeProvisioningHash(
             chip::Platform::MemoryFree(dataBuf);
 
             dataBufSize = certsLen;
-            dataBuf     = (uint8_t *) Platform::Security::MemoryAlloc(dataBufSize);
+            dataBuf     = (uint8_t *) chip::Platform::MemoryAlloc(dataBufSize);
             VerifyOrExit(dataBuf != NULL, err = CHIP_ERROR_NO_MEMORY);
         }
 
@@ -951,8 +955,8 @@ CHIP_ERROR GenericConfigurationManagerImpl<ImplClass>::_ComputeProvisioningHash(
 exit:
     if (dataBuf != NULL)
     {
-        Crypto::ClearSecretData(dataBuf, dataBufSize);
-        Platform::Security::MemoryFree(dataBuf);
+        chip::Crypto::ClearSecretData(dataBuf, dataBufSize);
+        chip::Platform::MemoryFree(dataBuf);
     }
 #endif // CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH
 
diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 0f54d8d2bc56d1..1db21576fb751c 100644
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -87,6 +87,7 @@ CHIP_LDADD                                      = \
     $(top_builddir)/src/platform/libDeviceLayer.a \
     $(top_builddir)/src/inet/libInetLayer.a       \
     $(top_builddir)/src/system/libSystemLayer.a   \
+    $(top_builddir)/src/crypto/libChipCrypto.a    \
     $(top_builddir)/src/lib/support/libSupportLayer.a   \
     $(NULL)
 

From bf11b410c6e647cdbf833d0539ab78d9107aa695 Mon Sep 17 00:00:00 2001
From: jepenven-silabs <67962328+jepenven-silabs@users.noreply.github.com>
Date: Thu, 16 Jul 2020 15:40:15 -0400
Subject: [PATCH 61/74] EFR32 fix lock app build (#1628)

* EFR32 fix lock app build

* Revert changes to BUILD.gn

- Since the EFR32 platform doesn't support GN build as for now, revert
  those changes
---
 config/efr32/efr32-app.mk                     |  9 ++++++---
 examples/lock-app/efr32/Makefile              |  1 +
 src/platform/EFR32/CHIPDevicePlatformConfig.h |  1 +
 .../EFR32/ConfigurationManagerImpl.cpp        | 20 +------------------
 src/platform/Makefile.am                      |  7 +++++++
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/config/efr32/efr32-app.mk b/config/efr32/efr32-app.mk
index 81bd2fe4cccd37..b745493fc884a8 100644
--- a/config/efr32/efr32-app.mk
+++ b/config/efr32/efr32-app.mk
@@ -122,7 +122,8 @@ EXTRA_SRCS += \
     $(EFR32_SDK_ROOT)/util/third_party/segger/systemview/SEGGER/SEGGER_RTT.c
 
 STD_INC_DIRS += \
-    $(CHIP_ROOT)/src/include/platform/EFR32                                                 \
+    $(CHIP_ROOT)/src/include/platform                                                       \
+    $(CHIP_ROOT)/src/platform/EFR32                                                         \
     $(FREERTOS_ROOT)/Source/include                                                         \
     $(FREERTOS_ROOT)/Source/portable/GCC/ARM_CM3                                            \
     $(EFR32_SDK_ROOT)                                                                       \
@@ -252,13 +253,15 @@ ifeq ($(EFR32FAMILY), efr32mg12)
 STD_LIBS += \
     $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG12P/GCC/libbluetooth.a \
     $(EFR32_SDK_ROOT)/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg12_gcc_release.a \
-    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a
+    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM4_gcc.a \
+    $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG12P/GCC/libmbedtls.a
 else
 ifeq ($(EFR32FAMILY), efr32mg21)
 STD_LIBS += \
     $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG21/GCC/libbluetooth.a \
     $(EFR32_SDK_ROOT)/platform/radio/rail_lib/autogen/librail_release/librail_multiprotocol_efr32xg21_gcc_release.a \
-    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a
+    $(EFR32_SDK_ROOT)/platform/emdrv/nvm3/lib/libnvm3_CM33_gcc.a \
+    $(EFR32_SDK_ROOT)/protocol/bluetooth/lib/EFR32MG21/GCC/libmbedtls.a
 endif
 endif
 
diff --git a/examples/lock-app/efr32/Makefile b/examples/lock-app/efr32/Makefile
index 50cfc789c05f9f..f63aef428948ec 100644
--- a/examples/lock-app/efr32/Makefile
+++ b/examples/lock-app/efr32/Makefile
@@ -116,6 +116,7 @@ SRCS = \
 
 INC_DIRS = \
     $(PROJECT_ROOT)                                                                       \
+    $(PROJECT_ROOT)/src/platform/EFR32/                                                   \
     $(PROJECT_ROOT)/include                                                               \
     $(PROJECT_ROOT)/traits/include                                                        \
     $(PROJECT_ROOT)/schema/include                                                        \
diff --git a/src/platform/EFR32/CHIPDevicePlatformConfig.h b/src/platform/EFR32/CHIPDevicePlatformConfig.h
index 5f0c3cb2d55435..a10e6dd439992e 100644
--- a/src/platform/EFR32/CHIPDevicePlatformConfig.h
+++ b/src/platform/EFR32/CHIPDevicePlatformConfig.h
@@ -130,5 +130,6 @@
 #ifndef CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME
 #define CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME "Bluetooth App Task"
 #endif // CHIP_DEVICE_CONFIG_BLE_APP_TASK_NAME
+#define CHIP_DEVICE_CONFIG_LOG_PROVISIONING_HASH 0
 
 #endif // CHIP_DEVICE_PLATFORM_CONFIG_H
diff --git a/src/platform/EFR32/ConfigurationManagerImpl.cpp b/src/platform/EFR32/ConfigurationManagerImpl.cpp
index 214288fe7d920c..cac80267b6d16b 100644
--- a/src/platform/EFR32/ConfigurationManagerImpl.cpp
+++ b/src/platform/EFR32/ConfigurationManagerImpl.cpp
@@ -28,23 +28,12 @@
 
 #include <platform/ConfigurationManager.h>
 #include <platform/EFR32/EFR32Config.h>
-#include <platform/EFR32/GroupKeyStoreImpl.h>
-#include <platform/Profiles/security/CHIPApplicationKeys.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-using namespace ::chip::Profiles::Security::AppKeys;
-using namespace ::chip::Profiles::DeviceDescription;
 using namespace ::chip::DeviceLayer::Internal;
 
-namespace {
-
-// Singleton instance of CHIP Group Key Store.
-GroupKeyStoreImpl gGroupKeyStore;
-
-} // unnamed namespace
-
 /** Singleton instance of the ConfigurationManager implementation object.
  */
 ConfigurationManagerImpl ConfigurationManagerImpl::sInstance;
@@ -58,9 +47,7 @@ CHIP_ERROR ConfigurationManagerImpl::_Init()
     err = Internal::GenericConfigurationManagerImpl<ConfigurationManagerImpl>::_Init();
     SuccessOrExit(err);
 
-    // Initialize the global GroupKeyStore object.
-    err = gGroupKeyStore.Init();
-    SuccessOrExit(err);
+    // TODO: Initialize the global GroupKeyStore object here (#1626)
 
     // If the fail-safe was armed when the device last shutdown, initiate a factory reset.
     if (_GetFailSafeArmed(failSafeArmed) == CHIP_NO_ERROR && failSafeArmed)
@@ -74,11 +61,6 @@ CHIP_ERROR ConfigurationManagerImpl::_Init()
     return err;
 }
 
-::chip::Profiles::Security::AppKeys::GroupKeyStoreBase * ConfigurationManagerImpl::_GetGroupKeyStore()
-{
-    return &gGroupKeyStore;
-}
-
 bool ConfigurationManagerImpl::_CanFactoryReset()
 {
     // TODO: query the application to determine if factory reset is allowed.
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
index 2acb4e2716c317..5c0348a6325fdd 100644
--- a/src/platform/Makefile.am
+++ b/src/platform/Makefile.am
@@ -211,12 +211,19 @@ libDeviceLayer_a_SOURCES               +=       \
     EFR32/freertos_bluetooth.c                  \
     EFR32/gatt_db.c                             \
     EFR32/PlatformManagerImpl.cpp               \
+    EFR32/ConfigurationManagerImpl.cpp          \
     EFR32/ConnectivityManagerImpl.cpp           \
     EFR32/EFR32Config.cpp                       \
     EFR32/Logging.cpp                           \
     FreeRTOS/SystemTimeSupport.cpp              \
     $(NULL)
 
+if CHIP_ENABLE_OPENTHREAD
+libDeviceLayer_a_SOURCES               +=       \
+    EFR32/ThreadStackManagerImpl.cpp            \
+    $(NULL)
+endif    
+
 endif # CHIP_DEVICE_LAYER_TARGET_EFR32
 
 if CHIP_DEVICE_LAYER_TARGET_ESP32

From dcc1419206b8814f92a8174479ef2471cfd001d9 Mon Sep 17 00:00:00 2001
From: Michael Spang <spang@google.com>
Date: Thu, 16 Jul 2020 16:47:34 -0400
Subject: [PATCH 62/74] Pull submodules (#1583)

Via scripts/helpers/pull_submodules.sh

Updates:
    git -C examples/common/m5stack-tft/repo log 42cadf2..42cadf2
    git -C third_party/openthread/repo log 4806fa4d0..c6d5c4aae
    git -C third_party/ot-br-posix/repo log 77a9156..250c6d6
    git -C third_party/pigweed/repo log 023f35b..ce87bc0
---
 .gitmodules                  | 8 ++++----
 third_party/openthread/repo  | 2 +-
 third_party/ot-br-posix/repo | 2 +-
 third_party/pigweed/repo     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index dc76d02b80f28b..dfcf6fa17a7326 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -39,22 +39,22 @@
 	url = https://github.com/jeremyjh/ESP32_TFT_library.git
 	branch = master
 	ignore = dirty
-	commit = 35be9760b4edf485287f78c0cf652beb19c047f0
+	commit = 42cadf2de25fa7e9b5d5d5189e90756cf9938df2
 [submodule "pigweed"]
 	path = third_party/pigweed/repo
 	url = https://pigweed.googlesource.com/pigweed/pigweed
 	branch = master
 	ignore = dirty
-	commit = 023f35bab59c73c498377d1be1b4e60534ce7b20
+	commit = ce87bc01d82d813506ece5122250a1b909d78e68
 [submodule "openthread"]
 	path = third_party/openthread/repo
 	url = https://github.com/openthread/openthread.git
 	branch = master
 	ignore = dirty
-	commit = 5f0e36eeb236a507631e9c822e43f742b7b6738a
+	commit = c6d5c4aae0ff9f891ec9f734f6b44598e569c48d
 [submodule "ot-br-posix"]
 	path = third_party/ot-br-posix/repo
 	url = https://github.com/openthread/ot-br-posix.git
 	branch = master
 	ignore = dirty
-	commit = 38e91052d1fb12a55c4e34073f9e399471650b4b
+	commit = 250c6d605b83910f86fa61fcdbde9ba67dcc7d93
diff --git a/third_party/openthread/repo b/third_party/openthread/repo
index 4806fa4d0dd454..c6d5c4aae0ff9f 160000
--- a/third_party/openthread/repo
+++ b/third_party/openthread/repo
@@ -1 +1 @@
-Subproject commit 4806fa4d0dd454d05452c1dbf219c7fb7ff2d3fa
+Subproject commit c6d5c4aae0ff9f891ec9f734f6b44598e569c48d
diff --git a/third_party/ot-br-posix/repo b/third_party/ot-br-posix/repo
index 77a91561a411de..250c6d605b8391 160000
--- a/third_party/ot-br-posix/repo
+++ b/third_party/ot-br-posix/repo
@@ -1 +1 @@
-Subproject commit 77a91561a411ded8c117c710f365213ec6a34ee2
+Subproject commit 250c6d605b83910f86fa61fcdbde9ba67dcc7d93
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 023f35bab59c73..ce87bc01d82d81 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 023f35bab59c73c498377d1be1b4e60534ce7b20
+Subproject commit ce87bc01d82d813506ece5122250a1b909d78e68

From 76bb6b5e8c1c0829012ecddbb2670fc7e4a4a7f1 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Thu, 16 Jul 2020 22:48:40 +0200
Subject: [PATCH 63/74] Glue standalone application to a device layer for POSIX
 platforms (#1534)

---
 config/standalone/standalone-chip.mk       | 11 ++++++--
 configure.ac                               | 24 ++++++++++++++---
 src/include/platform/CHIPDeviceEvent.h     |  1 +
 src/include/platform/ConnectivityManager.h |  2 +-
 src/platform/Makefile.am                   | 30 +++++++++++++++++++++-
 src/platform/tests/Makefile.am             | 28 +++++++++++---------
 third_party/Makefile.am                    |  8 ++++++
 third_party/mbedtls/Makefile.am            |  7 +++++
 8 files changed, 92 insertions(+), 19 deletions(-)

diff --git a/config/standalone/standalone-chip.mk b/config/standalone/standalone-chip.mk
index e189f64736764f..17daab73a69299 100644
--- a/config/standalone/standalone-chip.mk
+++ b/config/standalone/standalone-chip.mk
@@ -58,10 +58,10 @@ CHIP_OUTPUT_DIR = $(OUTPUT_DIR)/chip
 # An optional file containing application-specific configuration overrides.
 CHIP_PROJECT_CONFIG = $(wildcard $(PROJECT_ROOT)/include/CHIPProjectConfig.h)
 
-# Architcture on which CHIP is being built.
+# Architecture on which CHIP is being built.
 CHIP_BUILD_ARCH = $(shell $(CHIP_ROOT)/third_party/nlbuild-autotools/repo/third_party/autoconf/config.guess | sed -e 's/[[:digit:].]*$$//g')
 
-# Archtecture for which CHIP will be built.
+# Architecture for which CHIP will be built.
 CHIP_HOST_ARCH := $(CHIP_BUILD_ARCH)
 
 
@@ -135,12 +135,18 @@ STD_LDFLAGS += -L$(CHIP_OUTPUT_DIR)/lib
 # Add CHIP libraries to standard libraries list.
 STD_LIBS += \
     -lCHIP \
+    -lDeviceLayer \
     -lInetLayer \
     -lnlfaultinjection \
     -lSystemLayer
 
 STD_LIBS += $(shell pkg-config --libs openssl)
 
+ifeq ($(findstring linux,$(CHIP_HOST_ARCH)),linux)
+STD_LIBS += $(shell pkg-config --libs gio-2.0)
+STD_CFLAGS += $(shell pkg-config --cflags gio-2.0)
+endif
+
 # Add the appropriate CHIP target as a prerequisite to all application
 # compilation targets to ensure that CHIP gets built and its header
 # files installed prior to compiling any dependent source files.
@@ -149,6 +155,7 @@ STD_COMPILE_PREREQUISITES += install-chip
 # Add the CHIP libraries as prerequisites for linking the application.
 STD_LINK_PREREQUISITES += \
     $(CHIP_OUTPUT_DIR)/lib/libCHIP.a \
+    $(CHIP_OUTPUT_DIR)/lib/libDeviceLayer.a \
     $(CHIP_OUTPUT_DIR)/lib/libInetLayer.a \
     $(CHIP_OUTPUT_DIR)/lib/libnlfaultinjection.a \
     $(CHIP_OUTPUT_DIR)/lib/libSystemLayer.a
diff --git a/configure.ac b/configure.ac
index 788e0afb7639f8..8eb7f16898bae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -966,11 +966,11 @@ AC_DEFINE_UNQUOTED([CONFIG_NETWORK_LAYER_INET],[${CONFIG_NETWORK_LAYER_INET}],[D
 AC_MSG_CHECKING([device layer])
 AC_ARG_WITH(device-layer,
     [AS_HELP_STRING([--with-device-layer=LAYER],
-        [Specify the target environment for the CHIP Device Layer.  Choose one of: darwin, efr32, esp32, nrf5, linux, or none @<:@default=none@:>@.])],
+        [Specify the target environment for the CHIP Device Layer.  Choose one of: auto, darwin, efr32, esp32, nrf5, linux, or none @<:@default=auto@:>@.])],
     [
         case "${with_device_layer}" in
 
-        darwin|efr32|esp32|nrf5|linux|none)
+        auto|darwin|efr32|esp32|nrf5|linux|none)
             ;;
 
         *)
@@ -979,7 +979,7 @@ AC_ARG_WITH(device-layer,
 
         esac
     ],
-    [with_device_layer=none])
+    [with_device_layer=auto])
 AC_MSG_RESULT(${with_device_layer})
 
 # Disable all device layer targets by default
@@ -989,6 +989,24 @@ CHIP_DEVICE_LAYER_TARGET_ESP32=0
 CHIP_DEVICE_LAYER_TARGET_NRF5=0
 CHIP_DEVICE_LAYER_TARGET_LINUX=0
 
+if test "${with_device_layer}" = "auto"; then
+    case ${target_os} in
+
+	*darwin*)
+            with_device_layer=darwin
+	    ;;
+
+	*linux*)
+            with_device_layer=linux
+	    ;;
+
+	*)
+            with_device_layer=none
+	    ;;
+
+    esac
+fi
+
 case "${with_device_layer}" in
 
 darwin)
diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
index 337e3b1d2a1918..ace79c752268ef 100644
--- a/src/include/platform/CHIPDeviceEvent.h
+++ b/src/include/platform/CHIPDeviceEvent.h
@@ -275,6 +275,7 @@ typedef void (*AsyncWorkFunct)(intptr_t arg);
 #include CHIPDEVICEPLATFORMEVENT_HEADER
 #endif
 
+#include <ble/BleConfig.h>
 #include <system/SystemPacketBuffer.h>
 
 namespace chip {
diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h
index 8021582df42bf1..106eaab5f75821 100644
--- a/src/include/platform/ConnectivityManager.h
+++ b/src/include/platform/ConnectivityManager.h
@@ -154,7 +154,7 @@ class ConnectivityManager
     bool HaveServiceConnectivity(void);
 
     // CHIPoBLE service methods
-    typedef void (*BleConnectionReceivedFunct)(BLEEndPoint * endpoint);
+    typedef void (*BleConnectionReceivedFunct)(Ble::BLEEndPoint * endpoint);
     void AddCHIPoBLEConnectionHandler(BleConnectionReceivedFunct handler);
     void RemoveCHIPoBLEConnectionHandler(void);
     CHIPoBLEServiceMode GetCHIPoBLEServiceMode(void);
diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am
index 5c0348a6325fdd..67cf31e2664fed 100644
--- a/src/platform/Makefile.am
+++ b/src/platform/Makefile.am
@@ -42,14 +42,26 @@ noinst_HEADERS                          = \
     @top_srcdir@/src/include/platform/PersistedStorage.h \
     @top_srcdir@/src/include/platform/SoftwareUpdateManager.h \
     @top_srcdir@/src/include/platform/TimeSyncManager.h \
+    @top_srcdir@/src/include/platform/ThreadStackManager.h \
     @top_srcdir@/src/include/platform/CHIPDeviceConfig.h \
     @top_srcdir@/src/include/platform/CHIPDeviceError.h \
     @top_srcdir@/src/include/platform/CHIPDeviceEvent.h \
     @top_srcdir@/src/include/platform/CHIPDeviceLayer.h \
     @top_srcdir@/src/include/platform/internal/BLEManager.h \
+    @top_srcdir@/src/include/platform/internal/CHIPDeviceLayerInternal.h \
+    @top_srcdir@/src/include/platform/internal/DeviceNetworkInfo.h \
     @top_srcdir@/src/include/platform/internal/EventLogging.h \
     @top_srcdir@/src/include/platform/internal/GenericConfigurationManagerImpl.h \
     @top_srcdir@/src/include/platform/internal/GenericConfigurationManagerImpl.ipp \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_BLE.ipp \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_NoBLE.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_NoTunnel.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h \
+    @top_srcdir@/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.ipp \
     @top_srcdir@/src/include/platform/internal/GenericPlatformManagerImpl.h \
     @top_srcdir@/src/include/platform/internal/GenericPlatformManagerImpl.ipp \
     @top_srcdir@/src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h \
@@ -58,11 +70,16 @@ noinst_HEADERS                          = \
     @top_srcdir@/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.ipp \
     @top_srcdir@/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h \
     @top_srcdir@/src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.ipp \
-    @top_srcdir@/src/include/platform/internal/CHIPDeviceLayerInternal.h \
+    @top_srcdir@/src/platform/Darwin/BlePlatformConfig.h \
     @top_srcdir@/src/platform/Darwin/CHIPDevicePlatformConfig.h \
     @top_srcdir@/src/platform/Darwin/CHIPDevicePlatformEvent.h \
+    @top_srcdir@/src/platform/Darwin/CHIPPlatformConfig.h \
     @top_srcdir@/src/platform/Darwin/ConfigurationManagerImpl.h \
+    @top_srcdir@/src/platform/Darwin/ConnectivityManagerImpl.h \
+    @top_srcdir@/src/platform/Darwin/InetPlatformConfig.h \
     @top_srcdir@/src/platform/Darwin/PlatformManagerImpl.h \
+    @top_srcdir@/src/platform/Darwin/PosixConfig.h \
+    @top_srcdir@/src/platform/Darwin/SystemPlatformConfig.h \
     @top_srcdir@/src/platform/nRF5/ConnectivityManagerImpl.h \
     @top_srcdir@/src/platform/nRF5/nRF5Config.h \
     @top_srcdir@/src/platform/nRF5/CHIPDevicePlatformConfig.h \
@@ -91,10 +108,21 @@ noinst_HEADERS                          = \
     @top_srcdir@/src/platform/ESP32/NetworkProvisioningServerImpl.h \
     @top_srcdir@/src/platform/ESP32/ESP32Utils.h \
     @top_srcdir@/src/platform/ESP32/ESP32Config.h \
+    @top_srcdir@/src/platform/Linux/BLEManagerImpl.h \
+    @top_srcdir@/src/platform/Linux/BlePlatformConfig.h \
+    @top_srcdir@/src/platform/Linux/CHIPLinuxStorage.h \
+    @top_srcdir@/src/platform/Linux/CHIPLinuxStorageIni.h \
     @top_srcdir@/src/platform/Linux/CHIPDevicePlatformConfig.h \
     @top_srcdir@/src/platform/Linux/CHIPDevicePlatformEvent.h \
+    @top_srcdir@/src/platform/Linux/CHIPPlatformConfig.h \
     @top_srcdir@/src/platform/Linux/ConfigurationManagerImpl.h \
+    @top_srcdir@/src/platform/Linux/ConnectivityManagerImpl.h \
+    @top_srcdir@/src/platform/Linux/InetPlatformConfig.h \
     @top_srcdir@/src/platform/Linux/PlatformManagerImpl.h \
+    @top_srcdir@/src/platform/Linux/PosixConfig.h \
+    @top_srcdir@/src/platform/Linux/SystemPlatformConfig.h \
+    @top_srcdir@/src/platform/Linux/ThreadStackManagerImpl.h \
+    @top_srcdir@/src/include/platform/internal/testing/ConfigUnitTest.h \
     $(NULL)
 
 if CONFIG_DEVICE_LAYER
diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 1db21576fb751c..07351ab1044d28 100644
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -76,9 +76,15 @@ AM_CPPFLAGS                                   += \
 if CHIP_WITH_OT_BR_POSIX
 AM_CPPFLAGS                                   += \
     $(DBUS_CFLAGS)                               \
-    $(OT_BR_POSIX_CPPFLAGS)                     \
+    $(OT_BR_POSIX_CPPFLAGS)                      \
     $(NULL)
+
 libPlatformTests_a_SOURCES += TestThreadStackMgr.cpp
+
+dist_libPlatformTests_a_HEADERS                += \
+    TestThreadStackMgr.h                          \
+    $(NULL)
+
 endif # CHIP_WITH_OT_BR_POSIX
 endif # CHIP_DEVICE_LAYER_TARGET_LINUX
 
@@ -92,21 +98,11 @@ CHIP_LDADD                                      = \
     $(NULL)
 
 if CHIP_DEVICE_LAYER_TARGET_LINUX
-CHIP_LDADD                                    += \
-    $(GIO_CFLAGS) $(GIO_LIBS)                    \
-    $(NULL)
-
-if CHIP_WITH_OT_BR_POSIX
-CHIP_LDADD                                    += \
-    $(DBUS_LIBS)                                 \
-    $(OT_BR_POSIX_LDFLAGS) $(OT_BR_POSIX_LIBS) \
-    $(NULL)
-endif # CHIP_WITH_OT_BR_POSIX
-endif # CHIP_DEVICE_LAYER_TARGET_LINUX
 
 COMMON_LDADD                                          = \
     libPlatformTests.a                                  \
     $(CHIP_LDADD)                                       \
+    $(GIO_CFLAGS) $(GIO_LIBS)                           \
     $(NLFAULTINJECTION_LDFLAGS) $(NLFAULTINJECTION_LIBS)\
     $(NLUNIT_TEST_LDFLAGS) $(NLUNIT_TEST_LIBS)          \
     $(LWIP_LDFLAGS) $(LWIP_LIBS)                        \
@@ -114,6 +110,14 @@ COMMON_LDADD                                          = \
     $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)                   \
     $(NULL)
 
+if CHIP_WITH_OT_BR_POSIX
+COMMON_LDADD                                   += \
+    $(DBUS_LIBS)                                  \
+    $(OT_BR_POSIX_LDFLAGS) $(OT_BR_POSIX_LIBS)    \
+    $(NULL)
+endif # CHIP_WITH_OT_BR_POSIX
+endif # CHIP_DEVICE_LAYER_TARGET_LINUX
+
 # Test applications that should be run when the 'check' target is run.
 
 check_PROGRAMS                                 = \
diff --git a/third_party/Makefile.am b/third_party/Makefile.am
index 6aa2b2d47fa745..7602c4d6964d41 100644
--- a/third_party/Makefile.am
+++ b/third_party/Makefile.am
@@ -29,6 +29,14 @@ EXTRA_DIST                                   = \
     nlbuild-autotools                          \
     $(NULL)
 
+if CHIP_DEVICE_LAYER_TARGET_LINUX
+if CHIP_WITH_OT_BR_POSIX
+EXTRA_DIST                                   += \
+    inipp                                       \
+    $(NULL)
+endif # CHIP_WITH_OT_BR_POSIX
+endif # CHIP_DEVICE_LAYER_TARGET_LINUX
+
 # Always package (e.g. for 'make dist') these subdirectories.
 
 DIST_SUBDIRS                                 = \
diff --git a/third_party/mbedtls/Makefile.am b/third_party/mbedtls/Makefile.am
index 3fd8a7fdfce1d1..94912fdf42ed08 100644
--- a/third_party/mbedtls/Makefile.am
+++ b/third_party/mbedtls/Makefile.am
@@ -122,6 +122,13 @@ nodist_libmbedtls_a_SOURCES                                                   +=
     $(NULL)
 endif
 
+if CHIP_DEVICE_LAYER_TARGET_LINUX
+nodist_libmbedtls_a_SOURCES                                                   += \
+    repo/library/entropy_poll.c             \
+    repo/library/timing.c                   \
+    $(NULL)
+endif
+
 libmbedtls_a_CPPFLAGS                                                          = \
     -I$(top_srcdir)/third_party/mbedtls/repo/include                             \
     $(MBEDTLS_CPPFLAGS)                                                          \

From f710f8b091d1a0ef6a1f57045882a132a00de880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Kr=C3=B3lik?=
 <66667989+Damian-Nordic@users.noreply.github.com>
Date: Fri, 17 Jul 2020 15:31:13 +0200
Subject: [PATCH 64/74] Adapt System layer to Zephyr OS (#1594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adapt System layer to Zephyr socket API

The System layer was based on the assumption that when
BSD socket API is available then other POSIX functions
can be used as well. Unfortunately, this is not the case
in Zephyr which only implements a subset of POSIX
requirements.

Replace usage of pipe() system call with an equivalent
usage of socketpair(). Update KConfig of the door-lock
example for nrfconnect platform to set up networking
properly.

This only makes sure that libSystemLayer.a builds correctly
when NCS and the socket-based Inet layer is used. However,
the Inet layer itself still has some build issues which
need to be resolved.

* Use eventfd for system event

* Adapt to GN build system and add unit tests

Co-authored-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
---
 src/system/BUILD.gn                           |   2 +
 src/system/SystemConfig.h                     |  16 ++
 src/system/SystemLayer.am                     |   2 +
 src/system/SystemLayer.cpp                    |  59 ++----
 src/system/SystemLayer.h                      |   6 +-
 src/system/SystemWakeEvent.cpp                | 127 ++++++++++++
 src/system/SystemWakeEvent.h                  |  69 +++++++
 src/system/tests/BUILD.gn                     |   2 +
 src/system/tests/Makefile.am                  |   5 +
 src/system/tests/TestSystemLayer.h            |   1 +
 src/system/tests/TestSystemWakeEvent.cpp      | 191 ++++++++++++++++++
 .../tests/TestSystemWakeEventDriver.cpp       |  36 ++++
 12 files changed, 467 insertions(+), 49 deletions(-)
 create mode 100644 src/system/SystemWakeEvent.cpp
 create mode 100644 src/system/SystemWakeEvent.h
 create mode 100644 src/system/tests/TestSystemWakeEvent.cpp
 create mode 100644 src/system/tests/TestSystemWakeEventDriver.cpp

diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index d6bc99c829a6d9..68fdbb0ba0f714 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -151,6 +151,8 @@ static_library("system") {
     "SystemStats.h",
     "SystemTimer.cpp",
     "SystemTimer.h",
+    "SystemWakeEvent.cpp",
+    "SystemWakeEvent.h",
     "TimeSource.h",
   ]
 
diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
index 7dbb4444c65f62..9653480f457f83 100644
--- a/src/system/SystemConfig.h
+++ b/src/system/SystemConfig.h
@@ -609,4 +609,20 @@ struct LwIPEvent;
 #define CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD 946684800
 #endif // CHIP_SYSTEM_CONFIG_VALID_REAL_TIME_THRESHOLD
 
+/**
+ *  @def CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+ *
+ *  @brief
+ *      Use the POSIX pipe() function.
+ *
+ *  Use the POSIX pipe() function to create an anonymous data stream.
+ *
+ *  Defaults to enabled if the system is using sockets (except for Zephyr RTOS).
+ */
+#ifndef CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+#if (CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK) && !__ZEPHYR__
+#define CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE 1
+#endif
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+
 #endif // defined(SYSTEMCONFIG_H)
diff --git a/src/system/SystemLayer.am b/src/system/SystemLayer.am
index 68ff1d89b8db43..f657233ede03e4 100644
--- a/src/system/SystemLayer.am
+++ b/src/system/SystemLayer.am
@@ -28,6 +28,7 @@ CHIP_BUILD_SYSTEM_LAYER_SOURCE_FILES                  = \
     @top_builddir@/src/system/SystemLayer.cpp           \
     @top_builddir@/src/system/SystemMutex.cpp           \
     @top_builddir@/src/system/SystemObject.cpp          \
+    @top_builddir@/src/system/SystemWakeEvent.cpp       \
     @top_builddir@/src/system/SystemTimer.cpp           \
     @top_builddir@/src/system/SystemPacketBuffer.cpp    \
     @top_builddir@/src/system/SystemStats.cpp           \
@@ -48,6 +49,7 @@ CHIP_BUILD_SYSTEM_LAYER_HEADER_FILES                  = \
     @top_builddir@/src/system/SystemLayer.h             \
     @top_builddir@/src/system/SystemMutex.h             \
     @top_builddir@/src/system/SystemObject.h            \
+    @top_builddir@/src/system/SystemWakeEvent.h         \
     @top_builddir@/src/system/SystemTimer.h             \
     @top_builddir@/src/system/SystemPacketBuffer.h      \
     @top_builddir@/src/system/TimeSource.h              \
diff --git a/src/system/SystemLayer.cpp b/src/system/SystemLayer.cpp
index 020f91aec22af1..1f7945aae418ea 100644
--- a/src/system/SystemLayer.cpp
+++ b/src/system/SystemLayer.cpp
@@ -98,9 +98,6 @@ Layer::Layer() : mLayerState(kLayerState_NotInitialized), mContext(NULL), mPlatf
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
-    this->mWakePipeIn  = 0;
-    this->mWakePipeOut = 0;
-
 #if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
     this->mHandleSelectThread = PTHREAD_NULL;
 #endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
@@ -110,10 +107,6 @@ Layer::Layer() : mLayerState(kLayerState_NotInitialized), mContext(NULL), mPlatf
 Error Layer::Init(void * aContext)
 {
     Error lReturn;
-#if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
-    int lPipeFDs[2];
-    int lOSReturn, lFlags;
-#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
 
     RegisterLayerErrorFormatter();
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS
@@ -134,21 +127,9 @@ Error Layer::Init(void * aContext)
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
-    // Create a Unix pipe to allow an arbitrary thread to wake the thread in the select loop.
-    lOSReturn = ::pipe(lPipeFDs);
-    VerifyOrExit(lOSReturn == 0, lReturn = chip::System::MapErrorPOSIX(errno));
-
-    this->mWakePipeIn  = lPipeFDs[0];
-    this->mWakePipeOut = lPipeFDs[1];
-
-    // Enable non-blocking mode for both ends of the pipe.
-    lFlags    = ::fcntl(this->mWakePipeIn, F_GETFL, 0);
-    lOSReturn = ::fcntl(this->mWakePipeIn, F_SETFL, lFlags | O_NONBLOCK);
-    VerifyOrExit(lOSReturn == 0, lReturn = chip::System::MapErrorPOSIX(errno));
-
-    lFlags    = ::fcntl(this->mWakePipeOut, F_GETFL, 0);
-    lOSReturn = ::fcntl(this->mWakePipeOut, F_SETFL, lFlags | O_NONBLOCK);
-    VerifyOrExit(lOSReturn == 0, lReturn = chip::System::MapErrorPOSIX(errno));
+    // Create an event to allow an arbitrary thread to wake the thread in the select loop.
+    lReturn = this->mWakeEvent.Open();
+    SuccessOrExit(lReturn);
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
 
     this->mLayerState = kLayerState_Initialized;
@@ -172,12 +153,7 @@ Error Layer::Shutdown()
     SuccessOrExit(lReturn);
 
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
-    if (this->mWakePipeOut != -1)
-    {
-        ::close(this->mWakePipeOut);
-        this->mWakePipeOut = -1;
-        this->mWakePipeIn  = -1;
-    }
+    mWakeEvent.Close();
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
 
     for (size_t i = 0; i < Timer::sPool.Size(); ++i)
@@ -615,10 +591,11 @@ void Layer::PrepareSelect(int & aSetSize, fd_set * aReadSet, fd_set * aWriteSet,
     if (this->State() != kLayerState_Initialized)
         return;
 
-    if (this->mWakePipeIn + 1 > aSetSize)
-        aSetSize = this->mWakePipeIn + 1;
+    const int wakeEventFd = this->mWakeEvent.GetNotifFD();
+    FD_SET(wakeEventFd, aReadSet);
 
-    FD_SET(this->mWakePipeIn, aReadSet);
+    if (wakeEventFd + 1 > aSetSize)
+        aSetSize = wakeEventFd + 1;
 
     const Timer::Epoch kCurrentEpoch = Timer::GetCurrentEpoch();
     Timer::Epoch lAwakenEpoch = kCurrentEpoch + static_cast<Timer::Epoch>(aSleepTime.tv_sec) * 1000 + aSleepTime.tv_usec / 1000;
@@ -689,17 +666,9 @@ void Layer::HandleSelectResult(int aSetSize, fd_set * aReadSet, fd_set * aWriteS
 
     if (aSetSize > 0)
     {
-        // If we woke because of someone writing to the wake pipe, clear the contents of the pipe before returning.
-        if (FD_ISSET(this->mWakePipeIn, aReadSet))
-        {
-            while (true)
-            {
-                uint8_t lBytes[128];
-                int lTmp = ::read(this->mWakePipeIn, static_cast<void *>(lBytes), sizeof(lBytes));
-                if (lTmp < static_cast<int>(sizeof(lBytes)))
-                    break;
-            }
-        }
+        // If we woke because of someone writing to the wake event, clear the event before returning.
+        if (FD_ISSET(this->mWakeEvent.GetNotifFD(), aReadSet))
+            this->mWakeEvent.Confirm();
     }
 
     const Timer::Epoch kCurrentEpoch = Timer::GetCurrentEpoch();
@@ -747,10 +716,8 @@ void Layer::WakeSelect()
     }
 #endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
 
-    // Write a single byte to the wake pipe to wake up the select call.
-    const uint8_t kByte     = 0;
-    const ssize_t kIOResult = ::write(this->mWakePipeOut, &kByte, 1);
-    static_cast<void>(kIOResult);
+    // Send notification to wake up the select call.
+    this->mWakeEvent.Notify();
 }
 
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
diff --git a/src/system/SystemLayer.h b/src/system/SystemLayer.h
index 0a46f4f8d6398b..407f0deb706d96 100644
--- a/src/system/SystemLayer.h
+++ b/src/system/SystemLayer.h
@@ -38,6 +38,8 @@
 
 // Include dependent headers
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS
+#include <system/SystemWakeEvent.h>
+
 #include <sys/select.h>
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS
 
@@ -188,9 +190,7 @@ class DLL_EXPORT Layer
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
 #if CHIP_SYSTEM_CONFIG_USE_SOCKETS || CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK
-    int mWakePipeIn;
-    int mWakePipeOut;
-
+    SystemWakeEvent mWakeEvent;
 #if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
     pthread_t mHandleSelectThread;
 #endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
diff --git a/src/system/SystemWakeEvent.cpp b/src/system/SystemWakeEvent.cpp
new file mode 100644
index 00000000000000..ac18dd283e6c3d
--- /dev/null
+++ b/src/system/SystemWakeEvent.cpp
@@ -0,0 +1,127 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file declares the abstraction of one-directional, anonymous
+ *      data stream built on top of two file descriptors.
+ */
+
+#include <system/SystemWakeEvent.h>
+
+#if CHIP_SYSTEM_CONFIG_USE_SOCKETS
+
+// Include additional CHIP headers
+#include <support/CodeUtils.h>
+
+// Include system and language headers
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#if !CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+#include <sys/eventfd.h>
+#endif
+
+namespace chip {
+namespace System {
+
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+
+namespace {
+inline int SetNonBlockingMode(int fd)
+{
+    int flags = ::fcntl(fd, F_GETFL, 0);
+    return ::fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+}
+} // anonymous namespace
+
+Error SystemWakeEvent::Open()
+{
+    mFDs[FD_READ] = mFDs[FD_WRITE] = -1;
+
+    if (::pipe(mFDs) < 0)
+        return chip::System::MapErrorPOSIX(errno);
+
+    if (SetNonBlockingMode(mFDs[FD_READ]) < 0)
+        return chip::System::MapErrorPOSIX(errno);
+
+    if (SetNonBlockingMode(mFDs[FD_WRITE]) < 0)
+        return chip::System::MapErrorPOSIX(errno);
+
+    return CHIP_SYSTEM_NO_ERROR;
+}
+
+void SystemWakeEvent::Close()
+{
+    ::close(mFDs[FD_WRITE]);
+    ::close(mFDs[FD_READ]);
+    mFDs[FD_READ] = mFDs[FD_WRITE] = -1;
+}
+
+void SystemWakeEvent::Confirm()
+{
+    uint8_t buffer[128];
+
+    while (::read(mFDs[FD_READ], buffer, sizeof(buffer)) == sizeof(buffer))
+        continue;
+}
+
+void SystemWakeEvent::Notify()
+{
+    char byte = 1;
+    ::write(mFDs[FD_WRITE], &byte, 1);
+}
+
+#else // CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+
+Error SystemWakeEvent::Open()
+{
+    mFD = eventfd(0, EFD_NONBLOCK);
+
+    if (mFD == -1)
+    {
+        return chip::System::MapErrorPOSIX(errno);
+    }
+
+    return CHIP_SYSTEM_NO_ERROR;
+}
+
+void SystemWakeEvent::Close()
+{
+    ::close(mFD);
+    mFD = -1;
+}
+
+void SystemWakeEvent::Confirm()
+{
+    uint64_t value;
+    ::read(mFD, &value, sizeof(value));
+}
+
+void SystemWakeEvent::Notify()
+{
+    uint64_t value = 1;
+    ::write(mFD, &value, sizeof(value));
+}
+
+#endif // CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+
+} // namespace System
+} // namespace chip
+
+#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS
diff --git a/src/system/SystemWakeEvent.h b/src/system/SystemWakeEvent.h
new file mode 100644
index 00000000000000..d784143e382a83
--- /dev/null
+++ b/src/system/SystemWakeEvent.h
@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file declares the abstraction of system wake event used for
+ *      resuming task from select system call.
+ */
+
+#ifndef SYSTEMWAKEEVENT_H
+#define SYSTEMWAKEEVENT_H
+
+// Include configuration headers
+#include <system/SystemConfig.h>
+
+#include <system/SystemError.h>
+
+namespace chip {
+namespace System {
+
+using ::chip::System::Error;
+
+class SystemWakeEvent
+{
+public:
+    Error Open(); /**< Initialize the pipeline */
+    void Close(); /**< Close both ends of the pipeline. */
+
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+    int GetNotifFD() const { return mFDs[FD_READ]; }
+#else
+    int GetNotifFD() const { return mFD; }
+#endif
+
+    void Notify();  /**< Set the event. */
+    void Confirm(); /**< Clear the event. */
+
+private:
+#if CHIP_SYSTEM_CONFIG_USE_POSIX_PIPE
+    enum
+    {
+        FD_READ  = 0,
+        FD_WRITE = 1
+    };
+
+    int mFDs[2];
+#else
+    int mFD;
+#endif
+};
+
+} // namespace System
+} // namespace chip
+
+#endif // SYSTEMWAKEEVENT_H
diff --git a/src/system/tests/BUILD.gn b/src/system/tests/BUILD.gn
index c9486e8d69c4eb..4a46157d941b58 100644
--- a/src/system/tests/BUILD.gn
+++ b/src/system/tests/BUILD.gn
@@ -26,6 +26,7 @@ chip_test_suite("tests") {
     "TestSystemObject.cpp",
     "TestSystemPacketBuffer.cpp",
     "TestSystemTimer.cpp",
+    "TestSystemWakeEvent.cpp",
     "TestTimeSource.cpp",
   ]
 
@@ -40,6 +41,7 @@ chip_test_suite("tests") {
     "TestSystemObject",
     "TestSystemPacketBuffer",
     "TestSystemTimer",
+    "TestSystemWakeEvent",
     "TestTimeSource",
   ]
 }
diff --git a/src/system/tests/Makefile.am b/src/system/tests/Makefile.am
index c7447ef7f4e2c9..68d76adb519946 100644
--- a/src/system/tests/Makefile.am
+++ b/src/system/tests/Makefile.am
@@ -47,6 +47,7 @@ libSystemLayerTests_a_SOURCES                         = \
     TestSystemObject.cpp                                \
     TestSystemPacketBuffer.cpp                          \
     TestSystemTimer.cpp                                 \
+    TestSystemWakeEvent.cpp                             \
     TestTimeSource.cpp                                  \
     $(NULL)
 
@@ -119,6 +120,7 @@ check_PROGRAMS                                       += \
     TestSystemObject                                    \
     TestSystemPacketBuffer                              \
     TestSystemTimer                                     \
+    TestSystemWakeEvent                                 \
     TestTimeSource                                      \
     $(NULL)
 
@@ -146,6 +148,9 @@ TestSystemPacketBuffer_LDADD                          = $(COMMON_LDADD)
 TestSystemTimer_SOURCES                               = TestSystemTimerDriver.cpp
 TestSystemTimer_LDADD                                 = $(COMMON_LDADD)
 
+TestSystemWakeEvent_SOURCES                           = TestSystemWakeEventDriver.cpp
+TestSystemWakeEvent_LDADD                             = $(COMMON_LDADD)
+
 TestTimeSource_SOURCES                               = TestTimeSourceDriver.cpp
 TestTimeSource_LDADD                                 = $(COMMON_LDADD)
 
diff --git a/src/system/tests/TestSystemLayer.h b/src/system/tests/TestSystemLayer.h
index 1736075cbd8c49..14872f924fa3fe 100644
--- a/src/system/tests/TestSystemLayer.h
+++ b/src/system/tests/TestSystemLayer.h
@@ -33,6 +33,7 @@ int TestSystemErrorStr(void);
 int TestSystemObject(void);
 int TestSystemPacketBuffer(void);
 int TestSystemTimer(void);
+int TestSystemWakeEvent(void);
 int TestTimeSource(void);
 
 #ifdef __cplusplus
diff --git a/src/system/tests/TestSystemWakeEvent.cpp b/src/system/tests/TestSystemWakeEvent.cpp
new file mode 100644
index 00000000000000..b0cb89cf977048
--- /dev/null
+++ b/src/system/tests/TestSystemWakeEvent.cpp
@@ -0,0 +1,191 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This is a unit test suite for <tt>chip::System::SystemWakeEvent</tt>
+ *
+ */
+
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+// config
+#include <system/SystemConfig.h>
+
+// module header
+#include "TestSystemLayer.h"
+
+#include <nlunit-test.h>
+#include <support/CodeUtils.h>
+#include <support/ErrorStr.h>
+#include <support/TestUtils.h>
+#include <system/SystemError.h>
+#include <system/SystemLayer.h>
+#include <system/SystemWakeEvent.h>
+
+#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
+#include <pthread.h>
+#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
+
+using chip::ErrorStr;
+using namespace chip::System;
+
+#if CHIP_SYSTEM_CONFIG_USE_SOCKETS
+struct TestContext
+{
+    SystemWakeEvent mWakeEvent;
+    fd_set mReadSet;
+    fd_set mWriteSet;
+    fd_set mErrorSet;
+
+    TestContext() { mWakeEvent.Open(); }
+    ~TestContext() { mWakeEvent.Close(); }
+
+    int SelectWakeEvent(timeval timeout = {})
+    {
+        FD_ZERO(&mReadSet);
+        FD_ZERO(&mWriteSet);
+        FD_ZERO(&mErrorSet);
+        FD_SET(mWakeEvent.GetNotifFD(), &mReadSet);
+        return select(mWakeEvent.GetNotifFD() + 1, &mReadSet, &mWriteSet, &mErrorSet, &timeout);
+    }
+};
+
+// Test input data.
+
+static void TestOpen(nlTestSuite * inSuite, void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+    NL_TEST_ASSERT(inSuite, lContext.mWakeEvent.GetNotifFD() >= 0);
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 0);
+}
+
+static void TestNotify(nlTestSuite * inSuite, void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 0);
+
+    // Check that select() succeeds after Notify() has been called
+    lContext.mWakeEvent.Notify();
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 1);
+    NL_TEST_ASSERT(inSuite, FD_ISSET(lContext.mWakeEvent.GetNotifFD(), &lContext.mReadSet));
+
+    // ...and state of the event is not cleared automatically
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 1);
+    NL_TEST_ASSERT(inSuite, FD_ISSET(lContext.mWakeEvent.GetNotifFD(), &lContext.mReadSet));
+}
+
+static void TestConfirm(nlTestSuite * inSuite, void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+
+    // Check that select() succeeds after Notify() has been called
+    lContext.mWakeEvent.Notify();
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 1);
+    NL_TEST_ASSERT(inSuite, FD_ISSET(lContext.mWakeEvent.GetNotifFD(), &lContext.mReadSet));
+
+    // Check that Confirm() clears state of the event
+    lContext.mWakeEvent.Confirm();
+    NL_TEST_ASSERT(inSuite, lContext.SelectWakeEvent() == 0);
+}
+
+#if CHIP_SYSTEM_CONFIG_POSIX_LOCKING
+static void * WaitForEvent(void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+    // wait 5 seconds
+    return reinterpret_cast<void *>(lContext.SelectWakeEvent(timeval{ 5, 0 }));
+}
+
+static void TestBlockingSelect(nlTestSuite * inSuite, void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+
+    // Clear the event
+    lContext.mWakeEvent.Confirm();
+
+    // Spawn a thread waiting for the event
+    pthread_t tid = 0;
+    NL_TEST_ASSERT(inSuite, 0 == pthread_create(&tid, nullptr, WaitForEvent, aContext));
+
+    lContext.mWakeEvent.Notify();
+    void * selectResult = nullptr;
+    NL_TEST_ASSERT(inSuite, 0 == pthread_join(tid, &selectResult));
+    NL_TEST_ASSERT(inSuite, selectResult == reinterpret_cast<void *>(1));
+}
+#else  // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
+static void TestBlockingSelect(nlTestSuite *, void *) {}
+#endif // CHIP_SYSTEM_CONFIG_POSIX_LOCKING
+
+static void TestClose(nlTestSuite * inSuite, void * aContext)
+{
+    TestContext & lContext = *static_cast<TestContext *>(aContext);
+    lContext.mWakeEvent.Close();
+
+    const auto notifFD = lContext.mWakeEvent.GetNotifFD();
+
+    // Check that Close() has cleaned up itself and reopen is possible
+    NL_TEST_ASSERT(inSuite, lContext.mWakeEvent.Open() == CHIP_SYSTEM_NO_ERROR);
+    NL_TEST_ASSERT(inSuite, notifFD < 0);
+}
+
+// Test Suite
+
+/**
+ *   Test Suite. It lists all the test functions.
+ */
+// clang-format off
+static const nlTest sTests[] =
+{
+    NL_TEST_DEF("WakeEvent::TestOpen",              TestOpen),
+    NL_TEST_DEF("WakeEvent::TestNotify",            TestNotify),
+    NL_TEST_DEF("WakeEvent::TestConfirm",           TestConfirm),
+    NL_TEST_DEF("WakeEvent::TestBlockingSelect",    TestBlockingSelect),
+    NL_TEST_DEF("WakeEvent::TestClose",             TestClose),
+    NL_TEST_SENTINEL()
+};
+// clang-format on
+
+// clang-format off
+static nlTestSuite kTheSuite =
+{
+    "chip-system-wake-event",
+    sTests
+};
+// clang-format on
+
+int TestSystemWakeEvent(void)
+{
+    TestContext context;
+
+    // Run test suit againt one lContext.
+    nlTestRunner(&kTheSuite, &context);
+
+    return nlTestRunnerStats(&kTheSuite);
+}
+#else  // CHIP_SYSTEM_CONFIG_USE_SOCKETS
+int TestSystemWakeEvent(void)
+{
+    return SUCCESS;
+}
+#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS
+
+static void __attribute__((constructor)) TestSystemWakeEventCtor(void)
+{
+    VerifyOrDie(chip::RegisterUnitTests(&TestSystemWakeEvent) == CHIP_NO_ERROR);
+}
diff --git a/src/system/tests/TestSystemWakeEventDriver.cpp b/src/system/tests/TestSystemWakeEventDriver.cpp
new file mode 100644
index 00000000000000..3fea1c4699b6a9
--- /dev/null
+++ b/src/system/tests/TestSystemWakeEventDriver.cpp
@@ -0,0 +1,36 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file implements a standalone/native program executable
+ *      test driver for the CHIP system layer library timer unit
+ *      tests.
+ *
+ */
+
+#include "TestSystemLayer.h"
+
+#include <nlunit-test.h>
+
+int main(int argc, char * argv[])
+{
+    // Generate machine-readable, comma-separated value (CSV) output.
+    nlTestSetOutputStyle(OUTPUT_CSV);
+
+    return TestSystemWakeEvent();
+}

From a035dd93d2f3873b665c4479c6acf609ee2c4854 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <44623591+yufengwangca@users.noreply.github.com>
Date: Fri, 17 Jul 2020 11:36:33 -0700
Subject: [PATCH 65/74] Improve CHIP error constant defines to be consistent
 and accurate (#1640)

* Align CHIP error constant name in consistent naming convention
* Add CHIP error constants for persistent file access
---
 src/lib/core/CHIPError.cpp                    | 19 ++++++--
 src/lib/core/CHIPError.h                      | 48 +++++++++++++++----
 src/lib/core/tests/TestCHIPErrorStr.cpp       |  4 +-
 .../TestPersistedStorageImplementation.cpp    | 14 +++---
 src/platform/Darwin/PosixConfig.cpp           | 30 ++++++------
 src/platform/Linux/CHIPLinuxStorage.cpp       |  4 +-
 src/platform/Linux/CHIPLinuxStorageIni.cpp    |  8 ++--
 src/platform/Linux/PosixConfig.cpp            | 22 ++++-----
 8 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
index 792bcdb74cc2c4..e132555c4d4dbc 100644
--- a/src/lib/core/CHIPError.cpp
+++ b/src/lib/core/CHIPError.cpp
@@ -225,7 +225,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_UNKNOWN_TOPIC:
         desc = "Unknown Topic";
         break;
-
     case CHIP_ERROR_TIMEOUT:
         desc = "Timeout";
         break;
@@ -283,7 +282,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_UNSUPPORTED_AUTH_MODE:
         desc = "Unsupported authentication mode";
         break;
-
     case CHIP_ERROR_INVALID_SERVICE_EP:
         desc = "Invalid service endpoint";
         break;
@@ -305,7 +303,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_NO_SW_UPDATE_AVAILABLE:
         desc = "No SW update available";
         break;
-
     case CHIP_ERROR_CA_CERT_NOT_FOUND:
         desc = "CA certificate not found";
         break;
@@ -342,7 +339,7 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_UNSUPPORTED_CASE_CONFIGURATION:
         desc = "Unsupported CASE configuration";
         break;
-    case CHIP_ERROR_CERT_LOAD_FAIL:
+    case CHIP_ERROR_CERT_LOAD_FAILED:
         desc = "Unable to load certificate";
         break;
     case CHIP_ERROR_CERT_NOT_TRUSTED:
@@ -546,7 +543,7 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED:
         desc = "Default event handler not called";
         break;
-    case CHIP_ERROR_PERSISTED_STORAGE_FAIL:
+    case CHIP_ERROR_PERSISTED_STORAGE_FAILED:
         desc = "Persisted storage failed";
         break;
     case CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND:
@@ -594,6 +591,18 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, int32_t err)
     case CHIP_ERROR_INTERNAL:
         desc = "Internal error";
         break;
+    case CHIP_ERROR_OPEN_FAILED:
+        desc = "Open file failed";
+        break;
+    case CHIP_ERROR_READ_FAILED:
+        desc = "Read from file failed";
+        break;
+    case CHIP_ERROR_WRITE_FAILED:
+        desc = "Write to file failed";
+        break;
+    case CHIP_ERROR_DECODE_FAILED:
+        desc = "Decoding failed";
+        break;
     }
 #endif // !CHIP_CONFIG_SHORT_ERROR_STR
 
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index 2eda8d58ec5c6e..520358b08a6b68 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -870,13 +870,13 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
 #define CHIP_ERROR_UNSUPPORTED_CASE_CONFIGURATION              _CHIP_ERROR(85)
 
 /**
- *  @def CHIP_ERROR_CERT_LOAD_FAIL
+ *  @def CHIP_ERROR_CERT_LOAD_FAILED
  *
  *  @brief
  *    A certificate load failed.
  *
  */
-#define CHIP_ERROR_CERT_LOAD_FAIL                              _CHIP_ERROR(86)
+#define CHIP_ERROR_CERT_LOAD_FAILED                             _CHIP_ERROR(86)
 
 /**
  *  @def CHIP_ERROR_CERT_NOT_TRUSTED
@@ -1531,7 +1531,7 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
  *   the required elements, or it contais both the MergeData element
  *   and DeletedDictionaryKeyList.
  */
-#define CHIP_ERROR_MALFORMED_DATA_ELEMENT                  _CHIP_ERROR(158)
+#define CHIP_ERROR_MALFORMED_DATA_ELEMENT                       _CHIP_ERROR(158)
 
 /**
  * @def CHIP_ERROR_WRONG_CERT_TYPE
@@ -1539,7 +1539,7 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
  * @brief
  *   The presented certificate was of the wrong type.
  */
-#define CHIP_ERROR_WRONG_CERT_TYPE                             _CHIP_ERROR(159)
+#define CHIP_ERROR_WRONG_CERT_TYPE                              _CHIP_ERROR(159)
 
 /**
  * @def CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED
@@ -1551,13 +1551,13 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
 #define CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED            _CHIP_ERROR(162)
 
 /**
- *  @def CHIP_ERROR_PERSISTED_STORAGE_FAIL
+ *  @def CHIP_ERROR_PERSISTED_STORAGE_FAILED
  *
  *  @brief
  *    Persisted storage memory read/write failure.
  *
  */
-#define CHIP_ERROR_PERSISTED_STORAGE_FAIL                      _CHIP_ERROR(163)
+#define CHIP_ERROR_PERSISTED_STORAGE_FAILED                     _CHIP_ERROR(163)
 
 /**
  *  @def CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND
@@ -1668,7 +1668,7 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
  *    same Trait Instance.
  *
  */
-#define CHIP_ERROR_INCONSISTENT_CONDITIONALITY              _CHIP_ERROR(179)
+#define CHIP_ERROR_INCONSISTENT_CONDITIONALITY                  _CHIP_ERROR(179)
 
 /**
  *  @def CHIP_ERROR_LOCAL_DATA_INCONSISTENT
@@ -1678,7 +1678,7 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
  *    Trait Instance and cannot support the operation requested.
  *
  */
-#define CHIP_ERROR_LOCAL_DATA_INCONSISTENT                  _CHIP_ERROR(180)
+#define CHIP_ERROR_LOCAL_DATA_INCONSISTENT                      _CHIP_ERROR(180)
 
 /**
  * @def CHIP_EVENT_ID_FOUND
@@ -1696,6 +1696,38 @@ typedef CHIP_CONFIG_ERROR_TYPE CHIP_ERROR;
  */
 #define CHIP_ERROR_INTERNAL                                     _CHIP_ERROR(183)
 
+/**
+ * @def CHIP_ERROR_OPEN_FAILED
+ *
+ * @brief
+ *   Open file failed
+ */
+#define CHIP_ERROR_OPEN_FAILED                                  _CHIP_ERROR(184)
+
+/**
+ * @def CHIP_ERROR_READ_FAILED
+ *
+ * @brief
+ *   Read from file failed
+ */
+#define CHIP_ERROR_READ_FAILED                                  _CHIP_ERROR(185)
+
+/**
+ * @def CHIP_ERROR_WRITE_FAILED
+ *
+ * @brief
+ *   Write to file failed
+ */
+#define CHIP_ERROR_WRITE_FAILED                                 _CHIP_ERROR(186)
+
+/**
+ * @def CHIP_ERROR_DECODE_FAILED
+ *
+ * @brief
+ *   Decoding failed
+ */
+#define CHIP_ERROR_DECODE_FAILED                                _CHIP_ERROR(187)
+
 /**
  *  @}
  */
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
index de1587b67118db..cf5c70980fc449 100644
--- a/src/lib/core/tests/TestCHIPErrorStr.cpp
+++ b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -135,7 +135,7 @@ static int32_t sContext[] =
     CHIP_ERROR_CERT_NOT_FOUND,
     CHIP_ERROR_INVALID_CASE_PARAMETER,
     CHIP_ERROR_UNSUPPORTED_CASE_CONFIGURATION,
-    CHIP_ERROR_CERT_LOAD_FAIL,
+    CHIP_ERROR_CERT_LOAD_FAILED,
     CHIP_ERROR_CERT_NOT_TRUSTED,
     CHIP_ERROR_INVALID_ACCESS_TOKEN,
     CHIP_ERROR_WRONG_CERT_SUBJECT,
@@ -211,7 +211,7 @@ static int32_t sContext[] =
     CHIP_ERROR_MALFORMED_DATA_ELEMENT,
     CHIP_ERROR_WRONG_CERT_TYPE,
     CHIP_ERROR_DEFAULT_EVENT_HANDLER_NOT_CALLED,
-    CHIP_ERROR_PERSISTED_STORAGE_FAIL,
+    CHIP_ERROR_PERSISTED_STORAGE_FAILED,
     CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND,
     CHIP_ERROR_PROFILE_STRING_CONTEXT_ALREADY_REGISTERED,
     CHIP_ERROR_PROFILE_STRING_CONTEXT_NOT_REGISTERED,
diff --git a/src/lib/support/tests/TestPersistedStorageImplementation.cpp b/src/lib/support/tests/TestPersistedStorageImplementation.cpp
index 62801f90d59a41..3d253ca74fb349 100644
--- a/src/lib/support/tests/TestPersistedStorageImplementation.cpp
+++ b/src/lib/support/tests/TestPersistedStorageImplementation.cpp
@@ -75,14 +75,14 @@ static CHIP_ERROR GetCounterValueFromFile(const char * aKey, uint32_t & aValue)
         {
             if (fgets(value, sizeof(value), sPersistentStoreFile) == NULL)
             {
-                err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+                err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
             }
             else
             {
                 RemoveEndOfLineSymbol(value);
 
                 if (!ParseInt(value, aValue, 0))
-                    err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+                    err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
             }
 
             ExitNow();
@@ -115,7 +115,7 @@ static CHIP_ERROR SaveCounterValueToFile(const char * aKey, uint32_t aValue)
         if (strcmp(key, aKey) == 0)
         {
             res = fputs(value, sPersistentStoreFile);
-            VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+            VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
             ExitNow();
         }
@@ -124,13 +124,13 @@ static CHIP_ERROR SaveCounterValueToFile(const char * aKey, uint32_t aValue)
     // If value not found in the file then write the counter key and
     // the counter value to the end of the file.
     res = fputs(aKey, sPersistentStoreFile);
-    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
     res = fputs("\n", sPersistentStoreFile);
-    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
     res = fputs(value, sPersistentStoreFile);
-    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(res != EOF, err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
 exit:
     fflush(sPersistentStoreFile);
@@ -155,7 +155,7 @@ CHIP_ERROR Read(const char * aKey, uint32_t & aValue)
         VerifyOrExit(it != sPersistentStore.end(), err = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
 
         size_t aValueLength = Base64Decode(it->second.c_str(), strlen(it->second.c_str()), (uint8_t *) &aValue);
-        VerifyOrExit(aValueLength == sizeof(uint32_t), err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+        VerifyOrExit(aValueLength == sizeof(uint32_t), err = CHIP_ERROR_PERSISTED_STORAGE_FAILED);
     }
 
 exit:
diff --git a/src/platform/Darwin/PosixConfig.cpp b/src/platform/Darwin/PosixConfig.cpp
index dd2ad6e8f964ff..caf2ae61aeed93 100644
--- a/src/platform/Darwin/PosixConfig.cpp
+++ b/src/platform/Darwin/PosixConfig.cpp
@@ -78,7 +78,7 @@ CHIP_ERROR PosixConfig::Init()
 
 CHIP_ERROR PosixConfig::ReadConfigValue(Key key, bool & val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -87,7 +87,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, bool & val)
 
 CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint32_t & val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -96,7 +96,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint32_t & val)
 
 CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint64_t & val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -105,7 +105,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint64_t & val)
 
 CHIP_ERROR PosixConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize, size_t & outLen)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -114,7 +114,7 @@ CHIP_ERROR PosixConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize,
 
 CHIP_ERROR PosixConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSize, size_t & outLen)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -123,7 +123,7 @@ CHIP_ERROR PosixConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSiz
 
 CHIP_ERROR PosixConfig::WriteConfigValue(Key key, bool val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -132,7 +132,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, bool val)
 
 CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint32_t val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -141,7 +141,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint32_t val)
 
 CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint64_t val)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -150,7 +150,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint64_t val)
 
 CHIP_ERROR PosixConfig::WriteConfigValueStr(Key key, const char * str)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -159,7 +159,7 @@ CHIP_ERROR PosixConfig::WriteConfigValueStr(Key key, const char * str)
 
 CHIP_ERROR PosixConfig::WriteConfigValueStr(Key key, const char * str, size_t strLen)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -168,7 +168,7 @@ CHIP_ERROR PosixConfig::WriteConfigValueStr(Key key, const char * str, size_t st
 
 CHIP_ERROR PosixConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_t dataLen)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -177,7 +177,7 @@ CHIP_ERROR PosixConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_
 
 CHIP_ERROR PosixConfig::ClearConfigValue(Key key)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -191,7 +191,7 @@ bool PosixConfig::ConfigValueExists(Key key)
 
 CHIP_ERROR PosixConfig::EnsureNamespace(const char * ns)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -200,7 +200,7 @@ CHIP_ERROR PosixConfig::EnsureNamespace(const char * ns)
 
 CHIP_ERROR PosixConfig::ClearNamespace(const char * ns)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
@@ -209,7 +209,7 @@ CHIP_ERROR PosixConfig::ClearNamespace(const char * ns)
 
 CHIP_ERROR PosixConfig::FactoryResetConfig(void)
 {
-    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+    CHIP_ERROR err = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
     SuccessOrExit(err);
 
 exit:
diff --git a/src/platform/Linux/CHIPLinuxStorage.cpp b/src/platform/Linux/CHIPLinuxStorage.cpp
index 4f2640febb631c..6501c7eece5efb 100644
--- a/src/platform/Linux/CHIPLinuxStorage.cpp
+++ b/src/platform/Linux/CHIPLinuxStorage.cpp
@@ -281,7 +281,7 @@ CHIP_ERROR ChipLinuxStorage::ClearAll(void)
     }
     else
     {
-        retval = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+        retval = CHIP_ERROR_WRITE_FAILED;
     }
 
     return retval;
@@ -314,7 +314,7 @@ CHIP_ERROR ChipLinuxStorage::Commit(void)
     }
     else
     {
-        retval = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+        retval = CHIP_ERROR_WRITE_FAILED;
     }
 
     return retval;
diff --git a/src/platform/Linux/CHIPLinuxStorageIni.cpp b/src/platform/Linux/CHIPLinuxStorageIni.cpp
index 0c4bd0d08548fa..f98cd84c4dc2e8 100644
--- a/src/platform/Linux/CHIPLinuxStorageIni.cpp
+++ b/src/platform/Linux/CHIPLinuxStorageIni.cpp
@@ -76,7 +76,7 @@ CHIP_ERROR ChipLinuxStorageIni::AddConfig(const std::string & configFile)
     else
     {
         ChipLogError(DeviceLayer, "Failed to open config file: %s", configFile.c_str());
-        retval = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+        retval = CHIP_ERROR_OPEN_FAILED;
     }
 
     return retval;
@@ -110,13 +110,13 @@ CHIP_ERROR ChipLinuxStorageIni::CommitConfig(const std::string & configFile)
         else
         {
             ChipLogError(DeviceLayer, "failed to rename (%s), %s (%d)", tmpPath.c_str(), strerror(errno), errno);
-            retval = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+            retval = CHIP_ERROR_WRITE_FAILED;
         }
     }
     else
     {
         ChipLogError(DeviceLayer, "failed to open file (%s) for writing", tmpPath.c_str());
-        retval = CHIP_ERROR_PERSISTED_STORAGE_FAIL;
+        retval = CHIP_ERROR_OPEN_FAILED;
     }
 
     return retval;
@@ -291,7 +291,7 @@ CHIP_ERROR ChipLinuxStorageIni::GetBinaryBlobValue(const char * key, uint8_t * d
         decodedDataLen = Base64Decode(encodedData, encodedDataLen, (uint8_t *) decodedData);
         if (decodedDataLen == UINT16_MAX || decodedDataLen > expectedDecodedLen)
         {
-            retval = CHIP_ERROR_NOT_IMPLEMENTED;
+            retval = CHIP_ERROR_DECODE_FAILED;
         }
 
         if (encodedData)
diff --git a/src/platform/Linux/PosixConfig.cpp b/src/platform/Linux/PosixConfig.cpp
index 6b8475f6584829..4cb45cff07c796 100644
--- a/src/platform/Linux/PosixConfig.cpp
+++ b/src/platform/Linux/PosixConfig.cpp
@@ -102,7 +102,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, bool & val)
     uint32_t intVal;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->ReadValue(key.Name, intVal);
     if (err == CHIP_ERROR_KEY_NOT_FOUND)
@@ -123,7 +123,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint32_t & val)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->ReadValue(key.Name, val);
     if (err == CHIP_ERROR_KEY_NOT_FOUND)
@@ -142,7 +142,7 @@ CHIP_ERROR PosixConfig::ReadConfigValue(Key key, uint64_t & val)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     // Special case the MfrDeviceId value, optionally allowing it to be read as a blob containing
     // a 64-bit big-endian integer, instead of a u64 value.
@@ -177,7 +177,7 @@ CHIP_ERROR PosixConfig::ReadConfigValueStr(Key key, char * buf, size_t bufSize,
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->ReadValueStr(key.Name, buf, bufSize, outLen);
     if (err == CHIP_ERROR_KEY_NOT_FOUND)
@@ -201,7 +201,7 @@ CHIP_ERROR PosixConfig::ReadConfigValueBin(Key key, uint8_t * buf, size_t bufSiz
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->ReadValueBin(key.Name, buf, bufSize, outLen);
     if (err == CHIP_ERROR_KEY_NOT_FOUND)
@@ -225,7 +225,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, bool val)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->WriteValue(key.Name, val ? true : false);
     SuccessOrExit(err);
@@ -246,7 +246,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint32_t val)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->WriteValue(key.Name, val);
     SuccessOrExit(err);
@@ -267,7 +267,7 @@ CHIP_ERROR PosixConfig::WriteConfigValue(Key key, uint64_t val)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->WriteValue(key.Name, val);
     SuccessOrExit(err);
@@ -290,7 +290,7 @@ CHIP_ERROR PosixConfig::WriteConfigValueStr(Key key, const char * str)
     if (str != NULL)
     {
         storage = GetStorageForNamespace(key);
-        VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+        VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
         err = storage->WriteValueStr(key.Name, str);
         SuccessOrExit(err);
@@ -341,7 +341,7 @@ CHIP_ERROR PosixConfig::WriteConfigValueBin(Key key, const uint8_t * data, size_
     if (data != NULL)
     {
         storage = GetStorageForNamespace(key);
-        VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+        VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
         err = storage->WriteValueBin(key.Name, data, dataLen);
         SuccessOrExit(err);
@@ -368,7 +368,7 @@ CHIP_ERROR PosixConfig::ClearConfigValue(Key key)
     ChipLinuxStorage * storage;
 
     storage = GetStorageForNamespace(key);
-    VerifyOrExit(storage != NULL, err = CHIP_ERROR_PERSISTED_STORAGE_FAIL);
+    VerifyOrExit(storage != NULL, err = CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND);
 
     err = storage->ClearValue(key.Name);
     if (err == CHIP_ERROR_KEY_NOT_FOUND)

From 5fca166a0c166dabfa6e43d84820896d5a5cd271 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Fri, 17 Jul 2020 20:38:22 +0200
Subject: [PATCH 66/74] error: invalid conversion from 'const char*' to 'char*'
 [-fpermissive] in screen-framework (#1639)

---
 examples/common/screen-framework/ListScreen.cpp    | 2 +-
 examples/common/screen-framework/ScreenManager.cpp | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/examples/common/screen-framework/ListScreen.cpp b/examples/common/screen-framework/ListScreen.cpp
index e358f3ab9a59e5..cc38ff27f00382 100644
--- a/examples/common/screen-framework/ListScreen.cpp
+++ b/examples/common/screen-framework/ListScreen.cpp
@@ -52,7 +52,7 @@ void ListScreen::Display()
     for (int count = 0, y = ScreenTitleSafeTop; i < model->GetItemCount() && count < items; ++i, ++count, y += ScreenFontHeight)
     {
         tft_fg = focusIndex == i ? ScreenFocusColor : ScreenNormalColor;
-        TFT_print(model->GetItemText(i).c_str(), ScreenTitleSafeTop, y);
+        TFT_print(const_cast<char *>(model->GetItemText(i).c_str()), ScreenTitleSafeTop, y);
     }
 }
 
diff --git a/examples/common/screen-framework/ScreenManager.cpp b/examples/common/screen-framework/ScreenManager.cpp
index 6814e50d8496c9..e4d6c6fffe09bf 100644
--- a/examples/common/screen-framework/ScreenManager.cpp
+++ b/examples/common/screen-framework/ScreenManager.cpp
@@ -96,7 +96,7 @@ struct LazyDisplay
 // Print text centered horizontally at x.
 void PrintCentered(const char * s, int x, int y)
 {
-    TFT_print(s, x - (TFT_getStringWidth(s) / 2), y);
+    TFT_print(const_cast<char *>(s), x - (TFT_getStringWidth(const_cast<char *>(s)) / 2), y);
 }
 
 // Print button text in appropriate location (1 to 3).
@@ -150,13 +150,14 @@ void ScreenManager::Display()
     if (screens.size() > 1)
     {
         tft_fg = focusBack ? ScreenFocusColor : ScreenNormalColor;
-        TFT_print("<", ScreenFontHeight, ScreenFontHeight / 2);
+        TFT_print(const_cast<char *>("<"), ScreenFontHeight, ScreenFontHeight / 2);
     }
 
     std::string title = screens.back()->GetTitle();
     tft_fg            = ScreenNormalColor;
-    TFT_print(title.c_str(), ScreenTitleSafeTop, ScreenFontHeight / 2); // within ScreenTitleSafeTop
-    TFT_drawRect(ScreenTitleSafeTop, ScreenFontHeight * 3 / 2, TFT_getStringWidth(title.c_str()), 2, ScreenNormalColor);
+    TFT_print(const_cast<char *>(title.c_str()), ScreenTitleSafeTop, ScreenFontHeight / 2); // within ScreenTitleSafeTop
+    TFT_drawRect(ScreenTitleSafeTop, ScreenFontHeight * 3 / 2, TFT_getStringWidth(const_cast<char *>(title.c_str())), 2,
+                 ScreenNormalColor);
 
     TFT_setFont(kButtonFont, nullptr);
     if (screens.back()->IsFocusable())

From 5eaf5dfd335fe88d4c2677bcd96bc438c7aefc66 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 12 Jul 2020 17:50:41 +0530
Subject: [PATCH 67/74] Introduce a command handler

---
 src/lib/datamodel/BUILD.gn                    |  1 +
 src/lib/datamodel/Cluster.h                   | 13 ++++++
 src/lib/datamodel/ClusterOnOff.h              | 46 +++++++++++++++++++
 src/lib/datamodel/ClusterServer.h             | 26 +++++++++++
 src/lib/datamodel/Command.h                   | 40 ++++++++++++++++
 src/lib/datamodel/DataModel.am                |  1 +
 src/lib/datamodel/tests/TestClusterServer.cpp | 43 +++++++++++++++++
 7 files changed, 170 insertions(+)
 create mode 100644 src/lib/datamodel/Command.h

diff --git a/src/lib/datamodel/BUILD.gn b/src/lib/datamodel/BUILD.gn
index 68a4e321b15076..5ef5f8e3301b2c 100644
--- a/src/lib/datamodel/BUILD.gn
+++ b/src/lib/datamodel/BUILD.gn
@@ -23,6 +23,7 @@ static_library("datamodel") {
     "ClusterBasic.h",
     "ClusterOnOff.h",
     "ClusterServer.h",
+    "Command.h",
     "Deque.h",
     "Endpoint.cpp",
     "Endpoint.h",
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index c412d11e00b285..e89306228d4d81 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -25,6 +25,7 @@
 #define CHIPBASECLUSTER_H_
 
 #include <datamodel/Attribute.h>
+#include <datamodel/Command.h>
 #include <datamodel/Deque.h>
 
 namespace chip {
@@ -69,6 +70,18 @@ class Cluster : public Deque<Cluster>
         return mAttrs.Find([attrId](Attribute * item) -> bool { return (item->mAttrId == attrId); });
     }
 
+    /**
+     * @brief
+     *   Handle commands specific to this cluster
+     *
+     * @param cmd the command that needs to be processed
+     */
+    virtual CHIP_ERROR HandleCommands(const Command & cmd)
+    {
+        /* Do nothing */
+        return CHIP_NO_ERROR;
+    }
+
     /**
      * @brief
      *   Set an attribute to a value
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 885ef3ccfcbda9..43ac7dc2057cad 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -38,6 +38,14 @@ static const AttributeId_t kAttributeIdGlobalSceneControl = 0x4000;
 static const AttributeId_t kAttributeIdOnTime             = 0x4001;
 static const AttributeId_t kAttributeIdOffWaitTime        = 0x4002;
 
+/* Command IDs */
+static const uint16_t kOnOffCmdIdOff                  = 0x00;
+static const uint16_t kOnOffCmdIdOn                   = 0x01;
+static const uint16_t kOnOffCmdIdToggle               = 0x02;
+static const uint16_t kOnOffCmdIdOffWithEffect        = 0x40;
+static const uint16_t kOnOffCmdIdOffWithRecall        = 0x41;
+static const uint16_t kOnOffCmdIdOnWithTimedOff       = 0x42;
+
 /**
  * @brief
  *   This class implements the OnOff cluster as defined in the CHIP specification.
@@ -61,6 +69,44 @@ class ClusterOnOff : public Cluster
         AddAttribute(&mOnTime);
         AddAttribute(&mOffWaitTime);
     }
+
+    virtual CHIP_ERROR HandleCommandOff(const Command & cmd)
+    {
+        return Set(kAttributeIdOnOff, ValueBool(false));
+    }
+    
+    virtual CHIP_ERROR HandleCommandOn(const Command & cmd)
+    {
+        return Set(kAttributeIdOnOff, ValueBool(true));
+    }
+    
+    virtual CHIP_ERROR HandleCommandToggle(const Command & cmd)
+    {
+        Value currentVal;
+        Get(kAttributeIdOnOff, currentVal);
+        return Set(kAttributeIdOnOff, ValueBool( ! ValueToBool(currentVal)));
+    }
+
+    virtual CHIP_ERROR HandleCommands(const Command & cmd)
+    {
+        switch (cmd.mId)
+        {
+        case kOnOffCmdIdOff:
+            HandleCommandOff(cmd);
+            break;
+        case kOnOffCmdIdOn:
+            HandleCommandOn(cmd);
+            break;
+        case kOnOffCmdIdToggle:
+            HandleCommandToggle(cmd);
+            break;
+        default:
+            /* Unsupported */
+            return CHIP_ERROR_INTERNAL;
+            break;
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 544c8dd32e4443..22d95832d3d8b1 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -175,6 +175,32 @@ class ClusterServer
         }
         return CHIP_ERROR_INTERNAL;
     }
+
+    /**
+     * @brief
+     *   Handle commands
+     *
+     * @param endpointId the index of the desired Endpoint
+     * @param clusterId the id of desired Cluster
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
+    CHIP_ERROR HandleCommands(uint8_t endPointId, uint16_t clusterId, const Command & cmd)
+    {
+        auto endpoint = GetEndpoint(endPointId);
+
+        if (endpoint != nullptr)
+        {
+            auto cluster = endpoint->GetCluster(clusterId);
+
+            if (cluster != nullptr)
+            {
+                return cluster->HandleCommands(cmd);
+            }
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/Command.h b/src/lib/datamodel/Command.h
new file mode 100644
index 00000000000000..d5936812dfe341
--- /dev/null
+++ b/src/lib/datamodel/Command.h
@@ -0,0 +1,40 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains class for Commands
+ *
+ */
+
+#ifndef CHIPCOMMAND_H_
+#define CHIPCOMMAND_H_
+
+namespace chip {
+namespace DataModel {
+
+class Command
+{
+public:
+    uint16_t mId;
+    uint8_t  mDirection;
+};
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPCOMMAND_H_ */
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index e2856c5dffdd3e..75b29ffc70963d 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -34,6 +34,7 @@ CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/Endpoint.h              \
     @top_builddir@/src/lib/datamodel/Value.h                \
     @top_builddir@/src/lib/datamodel/Deque.h                \
+    @top_builddir@/src/lib/datamodel/Command.h    \
     @top_builddir@/src/lib/datamodel/ClusterBasic.h    \
     @top_builddir@/src/lib/datamodel/ClusterOnOff.h      \
     $(NULL)
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 5d7c78bebcfa7a..ffa4c920ddc9a8 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -120,6 +120,48 @@ void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, switch2->mTestVector == true);
 }
 
+void TestHandleCommand(nlTestSuite * inSuite, void * inContext)
+{
+    const uint8_t ZCLVersion         = 10;
+    const uint8_t applicationVersion = 20;
+    const uint8_t stackVersion       = 1;
+    const uint8_t HWVersion          = 1;
+    Value value;
+
+    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    const uint8_t switch1Gpio = 10;
+    auto * switch1            = new testSwitch(switch1Gpio);
+    server.AddCluster(switch1);
+
+    /* Validate attributes of the OnOff Cluster on Endpoint 1 */
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
+
+    Command cmd;
+
+    /* Validate On */
+    cmd.mId = kOnOffCmdIdOn;
+    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
+
+    /* Validate Off */
+    cmd.mId = kOnOffCmdIdOff;
+    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
+
+    /* Validate Toggle */
+    cmd.mId = kOnOffCmdIdToggle;
+    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
+    cmd.mId = kOnOffCmdIdToggle;
+    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
+    NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
+}
+
 } // namespace
 
 int TestClusterServer(void)
@@ -129,6 +171,7 @@ int TestClusterServer(void)
      */
     static const nlTest sTests[] = { NL_TEST_DEF("TestClusterServerBasic", TestClusterServerBasic),
                                      NL_TEST_DEF("TestClusterServerTwoEndpoints", TestClusterServerTwoEndpoints),
+                                     NL_TEST_DEF("TestHandleCommand", TestHandleCommand),
                                      NL_TEST_SENTINEL() };
 
     nlTestSuite theSuite = {

From b2dcc9132883c1f494178b1a862070b86d7454ac Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Mon, 13 Jul 2020 16:30:05 +0530
Subject: [PATCH 68/74] Minor renames

---
 src/lib/datamodel/Cluster.h                   |  2 +-
 src/lib/datamodel/ClusterOnOff.h              | 41 ++++++++++++++++++-
 src/lib/datamodel/ClusterServer.h             |  4 +-
 src/lib/datamodel/Command.h                   |  8 ++++
 src/lib/datamodel/tests/TestClusterServer.cpp |  8 ++--
 5 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index e89306228d4d81..2a29d35c5e032e 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -76,7 +76,7 @@ class Cluster : public Deque<Cluster>
      *
      * @param cmd the command that needs to be processed
      */
-    virtual CHIP_ERROR HandleCommands(const Command & cmd)
+    virtual CHIP_ERROR HandleCommand(const Command & cmd)
     {
         /* Do nothing */
         return CHIP_NO_ERROR;
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 43ac7dc2057cad..53a270e127aec8 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -70,16 +70,46 @@ class ClusterOnOff : public Cluster
         AddAttribute(&mOffWaitTime);
     }
 
+    /**
+     * @brief
+     *   Handle the off command. This command is already handled in the ClusterOnOff class, and the
+     *   Cluster's Set() method will be called with the appropriate value. Applications may choose
+     *   to override this handling if required.
+     *
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
     virtual CHIP_ERROR HandleCommandOff(const Command & cmd)
     {
         return Set(kAttributeIdOnOff, ValueBool(false));
     }
     
+    /**
+     * @brief
+     *   Handle the on command. This command is already handled in the ClusterOnOff class, and the
+     *   Cluster's Set() method will be called with the appropriate value. Applications may choose
+     *   to override this handling if required.
+     *
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
     virtual CHIP_ERROR HandleCommandOn(const Command & cmd)
     {
         return Set(kAttributeIdOnOff, ValueBool(true));
     }
     
+    /**
+     * @brief
+     *   Handle the toggle command. This command is already handled in the ClusterOnOff class, and
+     *   the Cluster's Set() method will be called with the appropriate value. Applications may
+     *   choose to override this handling if required.
+     *
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
     virtual CHIP_ERROR HandleCommandToggle(const Command & cmd)
     {
         Value currentVal;
@@ -87,7 +117,16 @@ class ClusterOnOff : public Cluster
         return Set(kAttributeIdOnOff, ValueBool( ! ValueToBool(currentVal)));
     }
 
-    virtual CHIP_ERROR HandleCommands(const Command & cmd)
+    /**
+     * @brief
+     *   Handle commands for the Cluster OnOff. This is already handled in the ClusterOnOff
+     *   class. Applications may choose to override this handling if required.
+     *
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
+    virtual CHIP_ERROR HandleCommand(const Command & cmd)
     {
         switch (cmd.mId)
         {
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 22d95832d3d8b1..c715903ea073e1 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -186,7 +186,7 @@ class ClusterServer
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    CHIP_ERROR HandleCommands(uint8_t endPointId, uint16_t clusterId, const Command & cmd)
+    CHIP_ERROR HandleCommand(uint8_t endPointId, uint16_t clusterId, const Command & cmd)
     {
         auto endpoint = GetEndpoint(endPointId);
 
@@ -196,7 +196,7 @@ class ClusterServer
 
             if (cluster != nullptr)
             {
-                return cluster->HandleCommands(cmd);
+                return cluster->HandleCommand(cmd);
             }
         }
         return CHIP_ERROR_INTERNAL;
diff --git a/src/lib/datamodel/Command.h b/src/lib/datamodel/Command.h
index d5936812dfe341..150b7a916687b7 100644
--- a/src/lib/datamodel/Command.h
+++ b/src/lib/datamodel/Command.h
@@ -30,7 +30,15 @@ namespace DataModel {
 class Command
 {
 public:
+    /* The type of command, global, cluster-specific or manufacturer-specific */
+    enum {
+        CmdTypeGlobal  = 1,
+        CmdTypeCluster = 2,
+        CmdTypeMfg     = 3,
+    } mType;
+    /* The command identifier */
     uint16_t mId;
+    /* The direction of the command */
     uint8_t  mDirection;
 };
 
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index ffa4c920ddc9a8..f2a1b07000803f 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -141,23 +141,23 @@ void TestHandleCommand(nlTestSuite * inSuite, void * inContext)
 
     /* Validate On */
     cmd.mId = kOnOffCmdIdOn;
-    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(1, kClusterIdOnOff, cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
 
     /* Validate Off */
     cmd.mId = kOnOffCmdIdOff;
-    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(1, kClusterIdOnOff, cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 
     /* Validate Toggle */
     cmd.mId = kOnOffCmdIdToggle;
-    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(1, kClusterIdOnOff, cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
     cmd.mId = kOnOffCmdIdToggle;
-    server.HandleCommands(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(1, kClusterIdOnOff, cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 }

From a3ec967c100e899e9aef93c28208f799b14516a5 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Mon, 13 Jul 2020 20:58:51 +0530
Subject: [PATCH 69/74] Incorporate command processing

---
 .../server/esp32/main/CHIPDeviceManager.cpp   | 12 -----
 .../server/esp32/main/DataModelHandler.cpp    | 36 +++++++++++--
 .../server/esp32/main/EchoDeviceCallbacks.cpp | 14 -----
 .../server/esp32/main/EchoServer.cpp          |  6 ++-
 .../esp32/main/include/CHIPDeviceManager.h    | 16 ------
 .../esp32/main/include/DataModelHandler.h     |  4 +-
 .../esp32/main/include/EchoDeviceCallbacks.h  |  2 -
 src/lib/datamodel/BUILD.gn                    |  1 +
 src/lib/datamodel/ClusterOnOff.h              | 28 ++++------
 src/lib/datamodel/ClusterServer.cpp           | 54 +++++++++++++++++++
 src/lib/datamodel/ClusterServer.h             | 18 +------
 src/lib/datamodel/Command.h                   | 31 ++++++++---
 src/lib/datamodel/DataModel.am                |  1 +
 src/lib/datamodel/tests/TestClusterServer.cpp | 17 +++---
 14 files changed, 142 insertions(+), 98 deletions(-)
 create mode 100644 src/lib/datamodel/ClusterServer.cpp

diff --git a/examples/wifi-echo/server/esp32/main/CHIPDeviceManager.cpp b/examples/wifi-echo/server/esp32/main/CHIPDeviceManager.cpp
index c5f8d57e81ad8d..4da81322318164 100644
--- a/examples/wifi-echo/server/esp32/main/CHIPDeviceManager.cpp
+++ b/examples/wifi-echo/server/esp32/main/CHIPDeviceManager.cpp
@@ -84,17 +84,5 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
     return err;
 }
 
-extern "C" {
-void chipZclPostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId, uint8_t mask,
-                                        uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-{
-    CHIPDeviceManagerCallbacks * cb = CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
-    if (cb != nullptr)
-    {
-        cb->PostAttributeChangeCallback(endpoint, clusterId, attributeId, mask, manufacturerCode, type, size, value);
-    }
-}
-} // extern "C"
-
 } // namespace DeviceManager
 } // namespace chip
diff --git a/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp b/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
index 82dfdec73c1a3c..797c9f25c91899 100644
--- a/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
+++ b/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
@@ -21,18 +21,21 @@
  */
 
 #include "esp_log.h"
+#include <datamodel/Command.h>
 #include <system/SystemPacketBuffer.h>
 
 #include "DataModelHandler.h"
 #include "LEDWidget.h"
 
 extern "C" {
+#include "chip-zcl/chip-zcl-codec.h"
 #include "chip-zcl/chip-zcl.h"
 #include "gen/gen-cluster-id.h"
 #include "gen/gen-types.h"
 }
 
 using namespace ::chip;
+using namespace ::chip::DataModel;
 
 static const char * TAG = "data_model_server";
 
@@ -41,16 +44,41 @@ void InitDataModelHandler()
     chipZclEndpointInit();
 }
 
-void HandleDataModelMessage(System::PacketBuffer * buffer)
+static void DecodeHeader(ChipZclBuffer_t * buffer, Command * cmd)
 {
-    ChipZclStatus_t zclStatus = chipZclProcessIncoming((ChipZclBuffer_t *) buffer);
-    if (zclStatus == CHIP_ZCL_STATUS_SUCCESS)
+    ChipZclCodec_t codec;
+    uint8_t mask = 0;
+    chipZclCodecDecodeStart(&codec, buffer);
+    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &mask, sizeof(mask), NULL);
+    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mEndpointId), sizeof(cmd->mEndpointId), NULL);
+
+    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mId), sizeof(cmd->mId), NULL);
+    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mDirection), sizeof(cmd->mDirection), NULL);
+    cmd->mType = kCmdTypeGlobal;
+    if (mask & 0x01)
+    {
+        cmd->mType = kCmdTypeCluster;
+        chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mClusterId), sizeof(cmd->mClusterId), NULL);
+    }
+    if (mask & 0x02)
+    {
+        cmd->mType = kCmdTypeMfg;
+        chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mMfgCode), sizeof(cmd->mMfgCode), NULL);
+    }
+    chipZclCodecDecodeEnd(&codec);
+}
+
+void HandleDataModelMessage(ClusterServer & server, System::PacketBuffer * buffer)
+{
+    Command cmd;
+    DecodeHeader((ChipZclBuffer_t *) buffer, &cmd);
+    if (server.HandleCommand(cmd) != CHIP_NO_ERROR)
     {
         ESP_LOGI(TAG, "Data model processing success!");
     }
     else
     {
-        ESP_LOGI(TAG, "Data model processing failure: %d", zclStatus);
+        ESP_LOGI(TAG, "Data model processing failure");
     }
     System::PacketBuffer::Free(buffer);
 }
diff --git a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
index a7fc7d89bd268f..a27a17b1538099 100644
--- a/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoDeviceCallbacks.cpp
@@ -25,7 +25,6 @@
 
 #include "EchoDeviceCallbacks.h"
 #include "esp_log.h"
-#include <datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 
@@ -71,16 +70,3 @@ void EchoDeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, int
         ESP_LOGI(TAG, "Commissioner detected!");
     }
 }
-
-extern ClusterServer gServer;
-/* This function can be eliminated, and instead its contents will get executed */
-void EchoDeviceCallbacks::PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
-                                                      uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size,
-                                                      uint8_t * value)
-{
-    // At this point we can assume that value points to a boolean value.
-    Value cValue(kCHIPValueType_Bool);
-    memcpy((void *) &cValue.Int64, (void *) value, size);
-
-    gServer.SetValue(endpoint, clusterId, attributeId, cValue);
-}
diff --git a/examples/wifi-echo/server/esp32/main/EchoServer.cpp b/examples/wifi-echo/server/esp32/main/EchoServer.cpp
index 4dd2fd43626dd4..4ebb3dadc81e88 100644
--- a/examples/wifi-echo/server/esp32/main/EchoServer.cpp
+++ b/examples/wifi-echo/server/esp32/main/EchoServer.cpp
@@ -38,6 +38,7 @@
 #include <inet/IPAddress.h>
 #include <inet/InetError.h>
 #include <inet/InetLayer.h>
+#include <lib/datamodel/ClusterServer.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <support/CodeUtils.h>
 #include <support/ErrorStr.h>
@@ -56,7 +57,8 @@ using namespace ::chip::Inet;
 using namespace ::chip::Transport;
 
 constexpr NodeId kLocalNodeId = 12344321;
-extern LEDWidget statusLED; // In wifi-echo.cpp
+extern LEDWidget statusLED;                    // In wifi-echo.cpp
+extern chip::DataModel::ClusterServer gServer; // In wifi-echo.cpp
 
 namespace {
 
@@ -159,7 +161,7 @@ class EchoServerCallback : public SecureSessionMgrCallback
         // port from data model processing.
         if (ContentMayBeADataModelMessage(buffer))
         {
-            HandleDataModelMessage(buffer);
+            HandleDataModelMessage(gServer, buffer);
             buffer = NULL;
         }
         else
diff --git a/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h b/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
index b05ceae259e513..f3f1381129fd12 100644
--- a/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
+++ b/examples/wifi-echo/server/esp32/main/include/CHIPDeviceManager.h
@@ -64,22 +64,6 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
      */
     virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
 
-    /**
-     * @brief
-     *   Called after an attribute has been changed
-     *
-     * @param endpoint           endpoint id
-     * @param clusterID          cluster id
-     * @param attributeId        attribute id that was changed
-     * @param mask               mask of the attribute
-     * @param manufacturerCode   manufacturer code
-     * @param type               attribute type
-     * @param size               size of the attribute
-     * @param value              pointer to the new value
-     */
-    virtual void PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
-                                             uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value)
-    {}
     virtual ~CHIPDeviceManagerCallbacks() {}
 };
 
diff --git a/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h b/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
index 06c78bd8e58db7..bf4cf302556d88 100644
--- a/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
+++ b/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h
@@ -23,6 +23,7 @@
 #ifndef DATA_MODEL_HANDLER_H
 #define DATA_MODEL_HANDLER_H
 
+#include <lib/datamodel/ClusterServer.h>
 namespace chip {
 namespace System {
 class PacketBuffer;
@@ -39,9 +40,10 @@ void InitDataModelHandler();
  * Handle a message that should be processed via our data model processing
  * codepath.
  *
+ * @param [in] server The ClusterServer object that holds the data model
  * @param [in] buffer The buffer holding the message.  This function guarantees
  *                    that it will free the buffer before returning.
  */
-void HandleDataModelMessage(chip::System::PacketBuffer * buffer);
+void HandleDataModelMessage(chip::DataModel::ClusterServer & server, chip::System::PacketBuffer * buffer);
 
 #endif // DATA_MODEL_HANDLER_H
diff --git a/examples/wifi-echo/server/esp32/main/include/EchoDeviceCallbacks.h b/examples/wifi-echo/server/esp32/main/include/EchoDeviceCallbacks.h
index 2386b900fc28ce..aad620430d7278 100644
--- a/examples/wifi-echo/server/esp32/main/include/EchoDeviceCallbacks.h
+++ b/examples/wifi-echo/server/esp32/main/include/EchoDeviceCallbacks.h
@@ -34,8 +34,6 @@ class EchoDeviceCallbacks : public CHIPDeviceManagerCallbacks
 {
 public:
     virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
-    virtual void PostAttributeChangeCallback(uint8_t endpoint, ChipZclClusterId clusterId, ChipZclAttributeId attributeId,
-                                             uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value);
 };
 
 #endif // ECHO_DEVICE_CALLBACKS_H
diff --git a/src/lib/datamodel/BUILD.gn b/src/lib/datamodel/BUILD.gn
index 5ef5f8e3301b2c..46051083e59ed2 100644
--- a/src/lib/datamodel/BUILD.gn
+++ b/src/lib/datamodel/BUILD.gn
@@ -22,6 +22,7 @@ static_library("datamodel") {
     "Cluster.h",
     "ClusterBasic.h",
     "ClusterOnOff.h",
+    "ClusterServer.cpp",
     "ClusterServer.h",
     "Command.h",
     "Deque.h",
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 53a270e127aec8..54ce44ca0f7557 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -39,12 +39,12 @@ static const AttributeId_t kAttributeIdOnTime             = 0x4001;
 static const AttributeId_t kAttributeIdOffWaitTime        = 0x4002;
 
 /* Command IDs */
-static const uint16_t kOnOffCmdIdOff                  = 0x00;
-static const uint16_t kOnOffCmdIdOn                   = 0x01;
-static const uint16_t kOnOffCmdIdToggle               = 0x02;
-static const uint16_t kOnOffCmdIdOffWithEffect        = 0x40;
-static const uint16_t kOnOffCmdIdOffWithRecall        = 0x41;
-static const uint16_t kOnOffCmdIdOnWithTimedOff       = 0x42;
+static const uint16_t kOnOffCmdIdOff            = 0x00;
+static const uint16_t kOnOffCmdIdOn             = 0x01;
+static const uint16_t kOnOffCmdIdToggle         = 0x02;
+static const uint16_t kOnOffCmdIdOffWithEffect  = 0x40;
+static const uint16_t kOnOffCmdIdOffWithRecall  = 0x41;
+static const uint16_t kOnOffCmdIdOnWithTimedOff = 0x42;
 
 /**
  * @brief
@@ -80,11 +80,8 @@ class ClusterOnOff : public Cluster
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    virtual CHIP_ERROR HandleCommandOff(const Command & cmd)
-    {
-        return Set(kAttributeIdOnOff, ValueBool(false));
-    }
-    
+    virtual CHIP_ERROR HandleCommandOff(const Command & cmd) { return Set(kAttributeIdOnOff, ValueBool(false)); }
+
     /**
      * @brief
      *   Handle the on command. This command is already handled in the ClusterOnOff class, and the
@@ -95,11 +92,8 @@ class ClusterOnOff : public Cluster
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    virtual CHIP_ERROR HandleCommandOn(const Command & cmd)
-    {
-        return Set(kAttributeIdOnOff, ValueBool(true));
-    }
-    
+    virtual CHIP_ERROR HandleCommandOn(const Command & cmd) { return Set(kAttributeIdOnOff, ValueBool(true)); }
+
     /**
      * @brief
      *   Handle the toggle command. This command is already handled in the ClusterOnOff class, and
@@ -114,7 +108,7 @@ class ClusterOnOff : public Cluster
     {
         Value currentVal;
         Get(kAttributeIdOnOff, currentVal);
-        return Set(kAttributeIdOnOff, ValueBool( ! ValueToBool(currentVal)));
+        return Set(kAttributeIdOnOff, ValueBool(!ValueToBool(currentVal)));
     }
 
     /**
diff --git a/src/lib/datamodel/ClusterServer.cpp b/src/lib/datamodel/ClusterServer.cpp
new file mode 100644
index 00000000000000..1a0012cde4e0a5
--- /dev/null
+++ b/src/lib/datamodel/ClusterServer.cpp
@@ -0,0 +1,54 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file implements the ClusterServer class
+ *
+ */
+
+#include <datamodel/ClusterServer.h>
+
+namespace chip {
+namespace DataModel {
+
+CHIP_ERROR ClusterServer::HandleCommand(const Command & cmd)
+{
+    if (cmd.mDirection != kCmdDirectionClientToServer)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    auto endpoint = GetEndpoint(cmd.mEndpointId);
+    if (endpoint == nullptr)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    if (cmd.mType == kCmdTypeCluster)
+    {
+        auto cluster = endpoint->GetCluster(cmd.mClusterId);
+        if (cluster != nullptr)
+        {
+            return cluster->HandleCommand(cmd);
+        }
+    }
+    return CHIP_ERROR_INTERNAL;
+}
+
+} // namespace DataModel
+} // namespace chip
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index c715903ea073e1..426852884a69b8 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -180,27 +180,11 @@ class ClusterServer
      * @brief
      *   Handle commands
      *
-     * @param endpointId the index of the desired Endpoint
-     * @param clusterId the id of desired Cluster
      * @param cmd the command to handle
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    CHIP_ERROR HandleCommand(uint8_t endPointId, uint16_t clusterId, const Command & cmd)
-    {
-        auto endpoint = GetEndpoint(endPointId);
-
-        if (endpoint != nullptr)
-        {
-            auto cluster = endpoint->GetCluster(clusterId);
-
-            if (cluster != nullptr)
-            {
-                return cluster->HandleCommand(cmd);
-            }
-        }
-        return CHIP_ERROR_INTERNAL;
-    }
+    CHIP_ERROR HandleCommand(const Command & cmd);
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/Command.h b/src/lib/datamodel/Command.h
index 150b7a916687b7..045ce41c06b877 100644
--- a/src/lib/datamodel/Command.h
+++ b/src/lib/datamodel/Command.h
@@ -27,19 +27,38 @@
 namespace chip {
 namespace DataModel {
 
+enum CmdTypes
+{
+    kCmdTypeUnknown = 0,
+    kCmdTypeGlobal  = 1,
+    kCmdTypeCluster = 2,
+    kCmdTypeMfg     = 3,
+};
+
+enum CmdDirection : uint8_t
+{
+    kCmdDirectionClientToServer = 0,
+    kCmdDirectionServerToClient = 1,
+};
+
 class Command
 {
 public:
     /* The type of command, global, cluster-specific or manufacturer-specific */
-    enum {
-        CmdTypeGlobal  = 1,
-        CmdTypeCluster = 2,
-        CmdTypeMfg     = 3,
-    } mType;
+    CmdTypes mType;
     /* The command identifier */
     uint16_t mId;
+    /* The endpoint this command is for */
+    uint8_t mEndpointId;
     /* The direction of the command */
-    uint8_t  mDirection;
+    CmdDirection mDirection;
+    union
+    {
+        /* The ClusterId, if this is cluster-specific command */
+        uint16_t mClusterId;
+        /* The MfgCode, if this is manufacturer-specific command */
+        uint16_t mMfgCode;
+    };
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index 75b29ffc70963d..ecbbf3193202ec 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -25,6 +25,7 @@
 
 CHIP_BUILD_DATAMODEL_SOURCE_FILES                         = \
     @top_builddir@/src/lib/datamodel/Endpoint.cpp       \
+    @top_builddir@/src/lib/datamodel/ClusterServer.cpp       \
     $(NULL)
 
 CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index f2a1b07000803f..9c4bbfaaa051ec 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -128,7 +128,7 @@ void TestHandleCommand(nlTestSuite * inSuite, void * inContext)
     const uint8_t HWVersion          = 1;
     Value value;
 
-    chip::DataModel::ClusterServer server(ZCLVersion, applicationVersion, stackVersion, HWVersion);
+    chip::DataModel::ClusterServer server(applicationVersion, HWVersion);
     const uint8_t switch1Gpio = 10;
     auto * switch1            = new testSwitch(switch1Gpio);
     server.AddCluster(switch1);
@@ -138,26 +138,30 @@ void TestHandleCommand(nlTestSuite * inSuite, void * inContext)
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 
     Command cmd;
+    cmd.mEndpointId = 1;
+    cmd.mType       = kCmdTypeCluster;
+    cmd.mClusterId  = kClusterIdOnOff;
+    cmd.mDirection  = kCmdDirectionClientToServer;
 
     /* Validate On */
     cmd.mId = kOnOffCmdIdOn;
-    server.HandleCommand(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
 
     /* Validate Off */
     cmd.mId = kOnOffCmdIdOff;
-    server.HandleCommand(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 
     /* Validate Toggle */
     cmd.mId = kOnOffCmdIdToggle;
-    server.HandleCommand(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == true);
     cmd.mId = kOnOffCmdIdToggle;
-    server.HandleCommand(1, kClusterIdOnOff, cmd);
+    server.HandleCommand(cmd);
     server.GetValue(1, kClusterIdOnOff, kAttributeIdOnOff, value);
     NL_TEST_ASSERT(inSuite, ValueToBool(value) == false);
 }
@@ -171,8 +175,7 @@ int TestClusterServer(void)
      */
     static const nlTest sTests[] = { NL_TEST_DEF("TestClusterServerBasic", TestClusterServerBasic),
                                      NL_TEST_DEF("TestClusterServerTwoEndpoints", TestClusterServerTwoEndpoints),
-                                     NL_TEST_DEF("TestHandleCommand", TestHandleCommand),
-                                     NL_TEST_SENTINEL() };
+                                     NL_TEST_DEF("TestHandleCommand", TestHandleCommand), NL_TEST_SENTINEL() };
 
     nlTestSuite theSuite = {
         "TestClusterServer", &sTests[0], NULL /* setup */, NULL /* teardown */

From 3969595fdc2f66351f42f0feeaad1bc7aadd4553 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 15 Jul 2020 13:43:13 +0530
Subject: [PATCH 70/74] Fix return conditions

---
 src/lib/datamodel/ClusterOnOff.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 54ce44ca0f7557..ea9da657c3063c 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -125,18 +125,14 @@ class ClusterOnOff : public Cluster
         switch (cmd.mId)
         {
         case kOnOffCmdIdOff:
-            HandleCommandOff(cmd);
-            break;
+            return HandleCommandOff(cmd);
         case kOnOffCmdIdOn:
-            HandleCommandOn(cmd);
-            break;
+            return HandleCommandOn(cmd);
         case kOnOffCmdIdToggle:
-            HandleCommandToggle(cmd);
-            break;
+            return HandleCommandToggle(cmd);
         default:
             /* Unsupported */
             return CHIP_ERROR_INTERNAL;
-            break;
         }
         return CHIP_ERROR_INTERNAL;
     }

From 9fe09b84272436666742a07f62ca6f6e3764fe54 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Wed, 15 Jul 2020 16:19:46 +0530
Subject: [PATCH 71/74] Extend the 'Command' object to ZCLCommand

This is to validate its use in both client as well as server. The
'command' should allow for (a) letting clusters their custom
attributes from the command, and (b) sending out responses to certain
commands.
The easiest way for trying out sending out responses is to use it in
the client (which this commit does).

Next up, let's try to create a application-specific (mfg-specific)
Cluster that implements 'echo'. That should exercise all the typical
expectations from the 'Command'.

TODOs:
- Temporarily kept the ZCLCommand.h in lib/datamodel/ directory
---
 examples/chip-tool/main.cpp                   |  72 +++++-------
 .../server/esp32/main/DataModelHandler.cpp    |  40 ++-----
 src/lib/datamodel/BUILD.gn                    |   1 +
 src/lib/datamodel/ClusterOnOff.h              |  18 +++
 src/lib/datamodel/Command.h                   |  26 +++++
 src/lib/datamodel/DataModel.am                |   1 +
 src/lib/datamodel/ZCLCommand.h                | 107 ++++++++++++++++++
 7 files changed, 190 insertions(+), 75 deletions(-)
 create mode 100644 src/lib/datamodel/ZCLCommand.h

diff --git a/examples/chip-tool/main.cpp b/examples/chip-tool/main.cpp
index 4165855e5d32ac..e08581f6e253a6 100644
--- a/examples/chip-tool/main.cpp
+++ b/examples/chip-tool/main.cpp
@@ -30,6 +30,8 @@
 #include <unistd.h>
 
 #include <core/CHIPError.h>
+#include <datamodel/ClusterOnOff.h>
+#include <datamodel/ZCLCommand.h>
 #include <inet/InetLayer.h>
 #include <inet/UDPEndPoint.h>
 #include <support/CHIPLogging.h>
@@ -50,6 +52,7 @@ extern "C" {
 
 using namespace ::chip;
 using namespace ::chip::Inet;
+using namespace ::chip::DataModel;
 
 // NOTE: Remote device ID is in sync with the echo server device id
 //       At some point, we may want to add an option to connect to a device without
@@ -151,7 +154,7 @@ bool DetermineAddress(int argc, char * argv[], IPAddress * hostAddr, uint16_t *
     return true;
 }
 
-enum class Command
+enum class CommandIndicator
 {
     Off,
     On,
@@ -165,7 +168,7 @@ bool EqualsLiteral(const char * str, const char (&literal)[N])
     return strncmp(str, literal, N) == 0;
 }
 
-bool DetermineCommand(int argc, char * argv[], Command * command)
+bool DetermineCommand(int argc, char * argv[], CommandIndicator * command)
 {
     if (argc < 4)
     {
@@ -174,25 +177,25 @@ bool DetermineCommand(int argc, char * argv[], Command * command)
 
     if (EqualsLiteral(argv[3], "off"))
     {
-        *command = Command::Off;
+        *command = CommandIndicator::Off;
         return true;
     }
 
     if (EqualsLiteral(argv[3], "on"))
     {
-        *command = Command::On;
+        *command = CommandIndicator::On;
         return true;
     }
 
     if (EqualsLiteral(argv[3], "toggle"))
     {
-        *command = Command::Toggle;
+        *command = CommandIndicator::Toggle;
         return true;
     }
 
     if (EqualsLiteral(argv[3], "echo"))
     {
-        *command = Command::Echo;
+        *command = CommandIndicator::Echo;
         return true;
     }
 
@@ -205,15 +208,15 @@ union CommandArgs
     ChipZclEndpointId_t endpointId;
 };
 
-bool DetermineCommandArgs(int argc, char * argv[], Command command, CommandArgs * commandArgs)
+bool DetermineCommandArgs(int argc, char * argv[], CommandIndicator command, CommandArgs * commandArgs)
 {
-    if (command == Command::Echo)
+    if (command == CommandIndicator::Echo)
     {
         // No args.
         return true;
     }
 
-    if (command != Command::On && command != Command::Off && command != Command::Toggle)
+    if (command != CommandIndicator::On && command != CommandIndicator::Off && command != CommandIndicator::Toggle)
     {
         fprintf(stderr, "Need to define arg handling for command '%d'\n", int(command));
         return false;
@@ -264,58 +267,43 @@ void DoEcho(DeviceController::ChipDeviceController * controller, const IPAddress
     }
 }
 
+
 // Handle the on/off/toggle case, where we are sending a ZCL command and not
 // expecting a response at all.
-void DoOnOff(DeviceController::ChipDeviceController * controller, Command command, ChipZclEndpointId_t endpoint)
+void DoOnOff(DeviceController::ChipDeviceController * controller, CommandIndicator command, ChipZclEndpointId_t endpoint)
 {
-    ChipZclCommandId_t zclCommand;
+    // Make sure our buffer is big enough, but this will need a better setup!
+    static const size_t bufferSize = 1024;
+    auto * buffer                  = System::PacketBuffer::NewWithAvailableSize(bufferSize);
+    ZCLCommand cmd(buffer);
+
     switch (command)
     {
-    case Command::Off:
-        zclCommand = CHIP_ZCL_CLUSTER_ON_OFF_SERVER_COMMAND_OFF;
+    case CommandIndicator::Off:
+        ClusterOnOffEncodeOff(&cmd, endpoint);
         break;
-    case Command::On:
-        zclCommand = CHIP_ZCL_CLUSTER_ON_OFF_SERVER_COMMAND_ON;
+    case CommandIndicator::On:
+        ClusterOnOffEncodeOn(&cmd, endpoint);
         break;
-    case Command::Toggle:
-        zclCommand = CHIP_ZCL_CLUSTER_ON_OFF_SERVER_COMMAND_TOGGLE;
+    case CommandIndicator::Toggle:
+        ClusterOnOffEncodeToggle(&cmd, endpoint);
         break;
     default:
         fprintf(stderr, "Unknown command: %d\n", command);
         return;
     }
 
-    // Make sure our buffer is big enough, but this will need a better setup!
-    static const size_t bufferSize = 1024;
-    auto * buffer                  = System::PacketBuffer::NewWithAvailableSize(bufferSize);
-
-    ChipZclBuffer_t * zcl_buffer = (ChipZclBuffer_t *) buffer;
-    ChipZclCommandContext_t ctx  = {
-        endpoint,                       // endpointId
-        CHIP_ZCL_CLUSTER_ON_OFF,        // clusterId
-        true,                           // clusterSpecific
-        false,                          // mfgSpecific
-        0,                              // mfgCode
-        zclCommand,                     // commandId
-        ZCL_DIRECTION_CLIENT_TO_SERVER, // direction
-        0,                              // payloadStartIndex
-        nullptr,                        // request
-        nullptr                         // response
-    };
-    chipZclEncodeZclHeader(zcl_buffer, &ctx);
-
 #ifdef DEBUG
-    const size_t data_len = chipZclBufferDataLength(zcl_buffer);
+    const size_t data_len = chipZclBufferDataLength((ChipZclBuffer_t *) cmd.mBuffer);
 
     fprintf(stderr, "SENDING: %zu ", data_len);
     for (size_t i = 0; i < data_len; ++i)
     {
-        fprintf(stderr, "%d ", chipZclBufferPointer(zcl_buffer)[i]);
+        fprintf(stderr, "%d ", chipZclBufferPointer((ChipZclBuffer_t *) cmd.mBuffer)[i]);
     }
     fprintf(stderr, "\n");
 #endif
-
-    controller->SendMessage(NULL, buffer);
+    controller->SendMessage(NULL, (System::PacketBuffer *) cmd.mBuffer);
     controller->ServiceEvents();
 }
 
@@ -326,7 +314,7 @@ int main(int argc, char * argv[])
 {
     IPAddress host_addr;
     uint16_t port;
-    Command command;
+    CommandIndicator command;
     CHIP_ERROR err;
     CommandArgs commandArgs;
     if (!DetermineAddress(argc, argv, &host_addr, &port) || !DetermineCommand(argc, argv, &command) ||
@@ -343,7 +331,7 @@ int main(int argc, char * argv[])
     err = controller->ConnectDevice(kRemoteDeviceId, host_addr, NULL, EchoKeyExchange, EchoResponse, ReceiveError, port);
     VerifyOrExit(err == CHIP_NO_ERROR, fprintf(stderr, "Failed to connect to the device"));
 
-    if (command == Command::Echo)
+    if (command == CommandIndicator::Echo)
     {
         DoEcho(controller, host_addr, port);
     }
diff --git a/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp b/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
index 797c9f25c91899..5181d581dd536a 100644
--- a/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
+++ b/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
@@ -21,8 +21,7 @@
  */
 
 #include "esp_log.h"
-#include <datamodel/Command.h>
-#include <system/SystemPacketBuffer.h>
+#include <datamodel/ZCLCommand.h>
 
 #include "DataModelHandler.h"
 #include "LEDWidget.h"
@@ -39,39 +38,13 @@ using namespace ::chip::DataModel;
 
 static const char * TAG = "data_model_server";
 
-void InitDataModelHandler()
-{
-    chipZclEndpointInit();
-}
-
-static void DecodeHeader(ChipZclBuffer_t * buffer, Command * cmd)
-{
-    ChipZclCodec_t codec;
-    uint8_t mask = 0;
-    chipZclCodecDecodeStart(&codec, buffer);
-    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &mask, sizeof(mask), NULL);
-    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mEndpointId), sizeof(cmd->mEndpointId), NULL);
-
-    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mId), sizeof(cmd->mId), NULL);
-    chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mDirection), sizeof(cmd->mDirection), NULL);
-    cmd->mType = kCmdTypeGlobal;
-    if (mask & 0x01)
-    {
-        cmd->mType = kCmdTypeCluster;
-        chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mClusterId), sizeof(cmd->mClusterId), NULL);
-    }
-    if (mask & 0x02)
-    {
-        cmd->mType = kCmdTypeMfg;
-        chipZclCodecDecode(&codec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(cmd->mMfgCode), sizeof(cmd->mMfgCode), NULL);
-    }
-    chipZclCodecDecodeEnd(&codec);
-}
+void InitDataModelHandler() {}
 
 void HandleDataModelMessage(ClusterServer & server, System::PacketBuffer * buffer)
 {
-    Command cmd;
-    DecodeHeader((ChipZclBuffer_t *) buffer, &cmd);
+    ZCLCommand cmd(buffer);
+    cmd.StartDecode();
+
     if (server.HandleCommand(cmd) != CHIP_NO_ERROR)
     {
         ESP_LOGI(TAG, "Data model processing success!");
@@ -80,5 +53,6 @@ void HandleDataModelMessage(ClusterServer & server, System::PacketBuffer * buffe
     {
         ESP_LOGI(TAG, "Data model processing failure");
     }
-    System::PacketBuffer::Free(buffer);
+    cmd.EndDecode();
+    System::PacketBuffer::Free((chip::System::PacketBuffer *) cmd.mBuffer);
 }
diff --git a/src/lib/datamodel/BUILD.gn b/src/lib/datamodel/BUILD.gn
index 46051083e59ed2..3561308aa1f6d4 100644
--- a/src/lib/datamodel/BUILD.gn
+++ b/src/lib/datamodel/BUILD.gn
@@ -29,6 +29,7 @@ static_library("datamodel") {
     "Endpoint.cpp",
     "Endpoint.h",
     "Value.h",
+    "ZCLCommand.h",
   ]
 
   public_deps = [
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index ea9da657c3063c..b0dd693bf17373 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -138,6 +138,24 @@ class ClusterOnOff : public Cluster
     }
 };
 
+static void GenerateCommand(Command * cmd, uint16_t cmdId, uint16_t endpointId)
+{
+    cmd->mType       = kCmdTypeCluster;
+    cmd->mId         = cmdId;
+    cmd->mEndpointId = endpointId;
+    cmd->mDirection  = kCmdDirectionClientToServer;
+    cmd->mClusterId  = kClusterIdOnOff;
+
+    cmd->StartEncode();
+    cmd->EndEncode();
+}
+
+void ClusterOnOffEncodeOn(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdOn, endpointId); }
+
+void ClusterOnOffEncodeOff(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdOff, endpointId); }
+
+void ClusterOnOffEncodeToggle(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdToggle, endpointId); }
+
 } // namespace DataModel
 } // namespace chip
 
diff --git a/src/lib/datamodel/Command.h b/src/lib/datamodel/Command.h
index 045ce41c06b877..864d09653b0fe7 100644
--- a/src/lib/datamodel/Command.h
+++ b/src/lib/datamodel/Command.h
@@ -24,6 +24,8 @@
 #ifndef CHIPCOMMAND_H_
 #define CHIPCOMMAND_H_
 
+#include <core/CHIPError.h>
+
 namespace chip {
 namespace DataModel {
 
@@ -59,6 +61,30 @@ class Command
         /* The MfgCode, if this is manufacturer-specific command */
         uint16_t mMfgCode;
     };
+
+    /**
+     * @brief
+     *   Start the process to parse/decode the incoming buffer
+     */
+    virtual void StartDecode(void) {}
+
+    /**
+     * @brief
+     *   Start the process to encode the outgoing buffer
+     */
+    virtual void StartEncode(void) {}
+
+    /**
+     * @brief
+     *   End the process to parse/decode the buffer freeing up any resources for the parsed entity
+     */
+    virtual void EndDecode(void) {}
+
+    /**
+     * @brief
+     *   End the process to encode the buffer
+     */
+    virtual void EndEncode(void) {}
 };
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/DataModel.am b/src/lib/datamodel/DataModel.am
index ecbbf3193202ec..6f4d37c80be2cc 100644
--- a/src/lib/datamodel/DataModel.am
+++ b/src/lib/datamodel/DataModel.am
@@ -38,4 +38,5 @@ CHIP_BUILD_DATAMODEL_HEADER_FILES                              = \
     @top_builddir@/src/lib/datamodel/Command.h    \
     @top_builddir@/src/lib/datamodel/ClusterBasic.h    \
     @top_builddir@/src/lib/datamodel/ClusterOnOff.h      \
+    @top_builddir@/src/lib/datamodel/ZCLCommand.h      \
     $(NULL)
diff --git a/src/lib/datamodel/ZCLCommand.h b/src/lib/datamodel/ZCLCommand.h
new file mode 100644
index 00000000000000..19541948c21f11
--- /dev/null
+++ b/src/lib/datamodel/ZCLCommand.h
@@ -0,0 +1,107 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains the ZCLCommand class
+ *
+ */
+
+#ifndef CHIPZCLCOMMAND_H_
+#define CHIPZCLCOMMAND_H_
+
+#include <core/CHIPError.h>
+#include <datamodel/Command.h>
+#include <system/SystemPacketBuffer.h>
+
+extern "C" {
+#include "chip-zcl/chip-zcl-codec.h"
+#include "chip-zcl/chip-zcl.h"
+#include "gen/gen-cluster-id.h"
+#include "gen/gen-types.h"
+}
+
+namespace chip {
+namespace DataModel {
+
+/* TODO: Move this into a directory of its own, doesn't belong in lib/datamodel */
+class ZCLCommand : public Command
+{
+public:
+    ChipZclCodec_t mCodec;
+    ChipZclBuffer_t * mBuffer;
+
+    ZCLCommand(System::PacketBuffer * buffer) : mBuffer((ChipZclBuffer_t *) buffer) {}
+
+    void StartDecode(void)
+    {
+        uint8_t mask = 0;
+        chipZclCodecDecodeStart(&mCodec, mBuffer);
+        chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &mask, sizeof(mask), NULL);
+        chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mEndpointId), sizeof(mEndpointId), NULL);
+
+        chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mId), sizeof(mId), NULL);
+        chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mDirection), sizeof(mDirection), NULL);
+        mType = kCmdTypeGlobal;
+        if (mask & 0x01)
+        {
+            mType = kCmdTypeCluster;
+            chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mClusterId), sizeof(mClusterId), NULL);
+        }
+        if (mask & 0x02)
+        {
+            mType = kCmdTypeMfg;
+            chipZclCodecDecode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mMfgCode), sizeof(mMfgCode), NULL);
+        }
+    }
+
+    void EndDecode(void) { chipZclCodecDecodeEnd(&mCodec); }
+
+    void StartEncode(void)
+    {
+        uint8_t mask = 0;
+
+        chipZclCodecEncodeStart(&mCodec, mBuffer);
+        if (mType == kCmdTypeCluster)
+        {
+            mask |= 0x01;
+        }
+        if (mType == kCmdTypeMfg)
+        {
+            mask |= 0x02;
+        }
+        chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &mask, sizeof(mask));
+        chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mEndpointId), sizeof(mEndpointId));
+        chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mId), sizeof(mId));
+        chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mDirection), sizeof(mDirection));
+        if (mask & 0x01)
+        {
+            chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mClusterId), sizeof(mClusterId));
+        }
+        if (mask & 0x02)
+        {
+            chipZclCodecEncode(&mCodec, CHIP_ZCL_STRUCT_TYPE_INTEGER, &(mMfgCode), sizeof(mMfgCode));
+        }
+    }
+
+    void EndEncode(void) { chipZclCodecEncodeEnd(&mCodec); }
+};
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPZCLCOMMAND_H_ */

From e84a59f27f6011a525320fdb9fb89fb8d5c4cb27 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 19 Jul 2020 16:39:13 +0530
Subject: [PATCH 72/74] Create CommandId_t

---
 examples/chip-tool/main.cpp      |  1 -
 src/lib/datamodel/ClusterOnOff.h | 29 +++++++++++++++++++----------
 src/lib/datamodel/Command.h      |  4 +++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/examples/chip-tool/main.cpp b/examples/chip-tool/main.cpp
index e08581f6e253a6..e8c2c435b2149e 100644
--- a/examples/chip-tool/main.cpp
+++ b/examples/chip-tool/main.cpp
@@ -267,7 +267,6 @@ void DoEcho(DeviceController::ChipDeviceController * controller, const IPAddress
     }
 }
 
-
 // Handle the on/off/toggle case, where we are sending a ZCL command and not
 // expecting a response at all.
 void DoOnOff(DeviceController::ChipDeviceController * controller, CommandIndicator command, ChipZclEndpointId_t endpoint)
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index b0dd693bf17373..71804a7e916dc7 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -39,12 +39,12 @@ static const AttributeId_t kAttributeIdOnTime             = 0x4001;
 static const AttributeId_t kAttributeIdOffWaitTime        = 0x4002;
 
 /* Command IDs */
-static const uint16_t kOnOffCmdIdOff            = 0x00;
-static const uint16_t kOnOffCmdIdOn             = 0x01;
-static const uint16_t kOnOffCmdIdToggle         = 0x02;
-static const uint16_t kOnOffCmdIdOffWithEffect  = 0x40;
-static const uint16_t kOnOffCmdIdOffWithRecall  = 0x41;
-static const uint16_t kOnOffCmdIdOnWithTimedOff = 0x42;
+static const CommandId_t kOnOffCmdIdOff            = 0x00;
+static const CommandId_t kOnOffCmdIdOn             = 0x01;
+static const CommandId_t kOnOffCmdIdToggle         = 0x02;
+static const CommandId_t kOnOffCmdIdOffWithEffect  = 0x40;
+static const CommandId_t kOnOffCmdIdOffWithRecall  = 0x41;
+static const CommandId_t kOnOffCmdIdOnWithTimedOff = 0x42;
 
 /**
  * @brief
@@ -138,7 +138,7 @@ class ClusterOnOff : public Cluster
     }
 };
 
-static void GenerateCommand(Command * cmd, uint16_t cmdId, uint16_t endpointId)
+static inline void GenerateCommand(Command * cmd, CommandId_t cmdId, uint16_t endpointId)
 {
     cmd->mType       = kCmdTypeCluster;
     cmd->mId         = cmdId;
@@ -150,11 +150,20 @@ static void GenerateCommand(Command * cmd, uint16_t cmdId, uint16_t endpointId)
     cmd->EndEncode();
 }
 
-void ClusterOnOffEncodeOn(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdOn, endpointId); }
+static inline void ClusterOnOffEncodeOn(Command * cmd, uint16_t endpointId)
+{
+    GenerateCommand(cmd, kOnOffCmdIdOn, endpointId);
+}
 
-void ClusterOnOffEncodeOff(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdOff, endpointId); }
+static inline void ClusterOnOffEncodeOff(Command * cmd, uint16_t endpointId)
+{
+    GenerateCommand(cmd, kOnOffCmdIdOff, endpointId);
+}
 
-void ClusterOnOffEncodeToggle(Command * cmd, uint16_t endpointId) { GenerateCommand(cmd, kOnOffCmdIdToggle, endpointId); }
+static inline void ClusterOnOffEncodeToggle(Command * cmd, uint16_t endpointId)
+{
+    GenerateCommand(cmd, kOnOffCmdIdToggle, endpointId);
+}
 
 } // namespace DataModel
 } // namespace chip
diff --git a/src/lib/datamodel/Command.h b/src/lib/datamodel/Command.h
index 864d09653b0fe7..e17a636594da44 100644
--- a/src/lib/datamodel/Command.h
+++ b/src/lib/datamodel/Command.h
@@ -29,6 +29,8 @@
 namespace chip {
 namespace DataModel {
 
+typedef uint16_t CommandId_t;
+
 enum CmdTypes
 {
     kCmdTypeUnknown = 0,
@@ -49,7 +51,7 @@ class Command
     /* The type of command, global, cluster-specific or manufacturer-specific */
     CmdTypes mType;
     /* The command identifier */
-    uint16_t mId;
+    CommandId_t mId;
     /* The endpoint this command is for */
     uint8_t mEndpointId;
     /* The direction of the command */

From d0fca8363d02466fb505ff544bb9377932a17f8d Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Sun, 19 Jul 2020 23:26:51 +0530
Subject: [PATCH 73/74] Fix test

---
 src/lib/datamodel/tests/TestClusterServer.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/datamodel/tests/TestClusterServer.cpp b/src/lib/datamodel/tests/TestClusterServer.cpp
index 9c4bbfaaa051ec..0cd5f267bd4748 100644
--- a/src/lib/datamodel/tests/TestClusterServer.cpp
+++ b/src/lib/datamodel/tests/TestClusterServer.cpp
@@ -122,9 +122,7 @@ void TestClusterServerTwoEndpoints(nlTestSuite * inSuite, void * inContext)
 
 void TestHandleCommand(nlTestSuite * inSuite, void * inContext)
 {
-    const uint8_t ZCLVersion         = 10;
     const uint8_t applicationVersion = 20;
-    const uint8_t stackVersion       = 1;
     const uint8_t HWVersion          = 1;
     Value value;
 

From 0223a36fa8592ff051ab419fe1c9a8aa53423e78 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Tue, 21 Jul 2020 09:31:13 +0530
Subject: [PATCH 74/74] Temporary commit: Cluster DummyEcho

---
 src/lib/datamodel/BUILD.gn           |   1 +
 src/lib/datamodel/Cluster.h          |   2 +-
 src/lib/datamodel/ClusterDummyEcho.h | 110 +++++++++++++++++++++++++++
 src/lib/datamodel/ClusterOnOff.h     |  10 +--
 src/lib/datamodel/ClusterServer.cpp  |   2 +-
 src/lib/datamodel/ClusterServer.h    |   2 +-
 6 files changed, 119 insertions(+), 8 deletions(-)
 create mode 100644 src/lib/datamodel/ClusterDummyEcho.h

diff --git a/src/lib/datamodel/BUILD.gn b/src/lib/datamodel/BUILD.gn
index 3561308aa1f6d4..5f70242f7b1005 100644
--- a/src/lib/datamodel/BUILD.gn
+++ b/src/lib/datamodel/BUILD.gn
@@ -21,6 +21,7 @@ static_library("datamodel") {
     "Attribute.h",
     "Cluster.h",
     "ClusterBasic.h",
+    "ClusterDummyEcho.h",
     "ClusterOnOff.h",
     "ClusterServer.cpp",
     "ClusterServer.h",
diff --git a/src/lib/datamodel/Cluster.h b/src/lib/datamodel/Cluster.h
index 2a29d35c5e032e..dd7907a1dd0112 100644
--- a/src/lib/datamodel/Cluster.h
+++ b/src/lib/datamodel/Cluster.h
@@ -76,7 +76,7 @@ class Cluster : public Deque<Cluster>
      *
      * @param cmd the command that needs to be processed
      */
-    virtual CHIP_ERROR HandleCommand(const Command & cmd)
+    virtual CHIP_ERROR HandleCommand(Command & cmd)
     {
         /* Do nothing */
         return CHIP_NO_ERROR;
diff --git a/src/lib/datamodel/ClusterDummyEcho.h b/src/lib/datamodel/ClusterDummyEcho.h
new file mode 100644
index 00000000000000..c2ce17da52c599
--- /dev/null
+++ b/src/lib/datamodel/ClusterDummyEcho.h
@@ -0,0 +1,110 @@
+/*
+ *
+ *    Copyright (c) 2020 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.
+ */
+
+/**
+ *    @file
+ *      This file contains definitions for a dummy CHIP Cluster 'Echo' that can be used for
+ *      end-to-end testing.
+ *
+ */
+
+#ifndef CHIPCLUSTER_ECHO_H_
+#define CHIPCLUSTER_ECHO_H_
+
+#include <datamodel/Cluster.h>
+
+namespace chip {
+namespace DataModel {
+
+/* Cluster ID */
+static const ClusterId_t kClusterIdDummyEcho = 0xfc00;
+
+/* Attribute IDs */
+static const AttributeId_t kAttributeIdDummyEcho = 0x0000;
+
+/* Command IDs */
+static const CommandId_t kDummyEchoCmdIdEchoRequest  = 0x00;
+static const CommandId_t kDummyEchoCmdIdEchoResponse = 0x00;
+
+static inline void ClusterDummyEchoGenerateCommand(Command & cmd, CommandId_t cmdId, uint16_t endpointId)
+{
+    cmd.mEndpointId = endpointId;
+    cmd.mType       = kCmdTypeCluster;
+    cmd.mClusterId  = kClusterIdDummyEcho;
+    cmd.mId         = cmdId;
+    cmd.mDirection  = cmdId == kDummyEchoCmdIdEchoRequest ? kCmdDirectionClientToServer : kCmdDirectionServerToClient;
+    cmd.StartEncode();
+    cmd.EndEncode();
+}
+
+static inline void ClusterDummyEchoEncodeEchoRequest(Command & cmd, uint16_t endpointId)
+{
+    ClusterDummyEchoGenerateCommand(cmd, kDummyEchoCmdIdEchoRequest, endpointId);
+}
+
+static inline void ClusterDummyEchoEncodeEchoResponse(Command & cmd, uint16_t endpointId)
+{
+    ClusterDummyEchoGenerateCommand(cmd, kDummyEchoCmdIdEchoResponse, endpointId);
+};
+
+/**
+ * @brief
+ *   This class implements the DummyEcho cluster as defined in the CHIP specification.
+ */
+class ClusterDummyEcho : public Cluster
+{
+private:
+    /* Just a placeholder attribute that is never assigned to */
+    AttributeSimple<bool> mDummyEcho;
+
+public:
+    ClusterDummyEcho() : Cluster(kClusterIdDummyEcho), mDummyEcho(kAttributeIdDummyEcho) { AddAttribute(&mDummyEcho); }
+
+    virtual CHIP_ERROR HandleCommandEchoRequest(Command & cmd)
+    {
+        /* TODO The endpoint is fake here */
+        ClusterDummyEchoEncodeEchoResponse(cmd, 1);
+        return CHIP_NO_ERROR;
+    }
+
+    /**
+     * @brief
+     *   Handle commands for the Cluster DummyEcho. This is already handled in the ClusterDummyEcho
+     *   class. Applications may choose to override this handling if required.
+     *
+     * @param cmd the command to handle
+     *
+     * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
+     */
+    virtual CHIP_ERROR HandleCommand(Command & cmd)
+    {
+        switch (cmd.mId)
+        {
+        case kDummyEchoCmdIdEchoRequest:
+            return HandleCommandEchoRequest(cmd);
+        default:
+            /* Unsupported */
+            return CHIP_ERROR_INTERNAL;
+        }
+        return CHIP_ERROR_INTERNAL;
+    }
+};
+
+} // namespace DataModel
+} // namespace chip
+
+#endif /* CHIPCLUSTER_ECHO_H_ */
diff --git a/src/lib/datamodel/ClusterOnOff.h b/src/lib/datamodel/ClusterOnOff.h
index 71804a7e916dc7..d8d7995eaa6a52 100644
--- a/src/lib/datamodel/ClusterOnOff.h
+++ b/src/lib/datamodel/ClusterOnOff.h
@@ -120,7 +120,7 @@ class ClusterOnOff : public Cluster
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    virtual CHIP_ERROR HandleCommand(const Command & cmd)
+    virtual CHIP_ERROR HandleCommand(Command & cmd)
     {
         switch (cmd.mId)
         {
@@ -138,7 +138,7 @@ class ClusterOnOff : public Cluster
     }
 };
 
-static inline void GenerateCommand(Command * cmd, CommandId_t cmdId, uint16_t endpointId)
+static inline void ClusterOnOffGenerateCommand(Command * cmd, CommandId_t cmdId, uint16_t endpointId)
 {
     cmd->mType       = kCmdTypeCluster;
     cmd->mId         = cmdId;
@@ -152,17 +152,17 @@ static inline void GenerateCommand(Command * cmd, CommandId_t cmdId, uint16_t en
 
 static inline void ClusterOnOffEncodeOn(Command * cmd, uint16_t endpointId)
 {
-    GenerateCommand(cmd, kOnOffCmdIdOn, endpointId);
+    ClusterOnOffGenerateCommand(cmd, kOnOffCmdIdOn, endpointId);
 }
 
 static inline void ClusterOnOffEncodeOff(Command * cmd, uint16_t endpointId)
 {
-    GenerateCommand(cmd, kOnOffCmdIdOff, endpointId);
+    ClusterOnOffGenerateCommand(cmd, kOnOffCmdIdOff, endpointId);
 }
 
 static inline void ClusterOnOffEncodeToggle(Command * cmd, uint16_t endpointId)
 {
-    GenerateCommand(cmd, kOnOffCmdIdToggle, endpointId);
+    ClusterOnOffGenerateCommand(cmd, kOnOffCmdIdToggle, endpointId);
 }
 
 } // namespace DataModel
diff --git a/src/lib/datamodel/ClusterServer.cpp b/src/lib/datamodel/ClusterServer.cpp
index 1a0012cde4e0a5..7af632698638c0 100644
--- a/src/lib/datamodel/ClusterServer.cpp
+++ b/src/lib/datamodel/ClusterServer.cpp
@@ -26,7 +26,7 @@
 namespace chip {
 namespace DataModel {
 
-CHIP_ERROR ClusterServer::HandleCommand(const Command & cmd)
+CHIP_ERROR ClusterServer::HandleCommand(Command & cmd)
 {
     if (cmd.mDirection != kCmdDirectionClientToServer)
     {
diff --git a/src/lib/datamodel/ClusterServer.h b/src/lib/datamodel/ClusterServer.h
index 426852884a69b8..791ef9cdf0ddd7 100644
--- a/src/lib/datamodel/ClusterServer.h
+++ b/src/lib/datamodel/ClusterServer.h
@@ -184,7 +184,7 @@ class ClusterServer
      *
      * @return CHIP_NO_ERROR on success or a failure-specific error code otherwise
      */
-    CHIP_ERROR HandleCommand(const Command & cmd);
+    CHIP_ERROR HandleCommand(Command & cmd);
 };
 
 } // namespace DataModel