Switch on the Time sync cluster in the all-cluster-app

Michail-Antropov · Michail-Antropov · commit b8c97b8d1af6 · 2024-07-11T18:54:44.000+03:00
Fix bug: reset string attributes
Fix max size string attributes
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -7963,6 +7963,154 @@
             }
           ]
         },
+        {
+          "name": "Time Synchronization",
+          "code": 56,
+          "mfgCode": null,
+          "define": "TIME_SYNCHRONIZATION_CLUSTER",
+          "side": "server",
+          "enabled": 1,
+          "commands": [
+            {
+              "name": "SetUTCTime",
+              "code": 0,
+              "mfgCode": null,
+              "source": "client",
+              "isIncoming": 1,
+              "isEnabled": 1
+            }
+          ],
+          "attributes": [
+            {
+              "name": "UTCTime",
+              "code": 0,
+              "mfgCode": null,
+              "side": "server",
+              "type": "epoch_us",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "Granularity",
+              "code": 1,
+              "mfgCode": null,
+              "side": "server",
+              "type": "GranularityEnum",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "GeneratedCommandList",
+              "code": 65528,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AcceptedCommandList",
+              "code": 65529,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "EventList",
+              "code": 65530,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "AttributeList",
+              "code": 65531,
+              "mfgCode": null,
+              "side": "server",
+              "type": "array",
+              "included": 1,
+              "storageOption": "External",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "FeatureMap",
+              "code": 65532,
+              "mfgCode": null,
+              "side": "server",
+              "type": "bitmap32",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "0",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "ClusterRevision",
+              "code": 65533,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int16u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "2",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            }
+          ]
+        },
         {
           "name": "Switch",
           "code": 59,
@@ -14330,7 +14478,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14346,7 +14494,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14362,7 +14510,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14378,7 +14526,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14394,7 +14542,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14410,7 +14558,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14426,7 +14574,7 @@
               "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
diff --git a/examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h b/examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h
@@ -58,12 +58,9 @@ class CalendarProviderInstance : public CalendarProvider
     void ErrorMessage(EndpointId ep, const char * msg, ...) override;
 
 private:
-    //uint32_t mDate;
-    //uint32_t mTime;
-
     // Attributes contaners allocated memory
-    DataModel::Nullable<CharSpan> mName;
     DataModel::Nullable<uint32_t> mStartDate;
+
     DataModel::List<Structs::CalendarPeriodStruct::Type> mCalendarPeriods;
     DataModel::List<Structs::DayStruct::Type> mSpecialDays;
     DataModel::Nullable<Structs::PeakPeriodStruct::Type> mCurrentPeak;
diff --git a/examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp b/examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp
@@ -65,11 +65,6 @@ chip::app::Clusters::EnergyCalendar::CalendarProviderInstance::~CalendarProvider
 {
     FreeMemoryCalendarPeriodStructList(mCalendarPeriods);
     FreeMemoryDayStructList(mSpecialDays);
-    if (!mName.IsNull())
-    {
-        chip::Platform::MemoryFree((void *) mName.Value().data());
-        mName.SetNull();
-    }
 }
 
 void CalendarProviderInstance::Init(void)
@@ -81,7 +76,7 @@ void CalendarProviderInstance::Init(void)
 void CalendarProviderInstance::SetDefault(void)
 {
     SetCalendarID(std::nullopt);
-    SetName(std::nullopt);
+    SetName(nullptr);
     SetProviderID(std::nullopt);
     SetEventID(std::nullopt);
 
@@ -120,20 +115,14 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
     if (root.isMember("CalendarName"))
     {
         value = root.get("CalendarName", Json::Value());
-        if (!mName.IsNull())
+        if (value.isString())
         {
-            chip::Platform::MemoryFree((void *) mName.Value().data());
-            mName.SetNull();
+           SetName(value.asCString());
         }
-        if (value.isString())
+        else
         {
-            size_t len = value.asString().size();
-            char * str = (char *) chip::Platform::MemoryAlloc(len);
-            memcpy(str, value.asCString(), len);
-            CharSpan nameString(str, len);
-            mName = MakeNullable(static_cast<CharSpan>(nameString));
+            SetName(nullptr);
         }
-        SetName(mName);
     }
 
     if (root.isMember("ProviderID"))
diff --git a/examples/all-clusters-app/all-clusters-common/src/meter-identification-stub.cpp b/examples/all-clusters-app/all-clusters-common/src/meter-identification-stub.cpp
@@ -37,7 +37,7 @@ void emberAfMeterIdentificationClusterInitCallback(chip::EndpointId endpointId)
     if (gMIDelegate)
     {
         gMIDelegate->Init();
-        
+
         gMIInstance = std::make_unique<MeterIdentificationInstance>(endpointId, *gMIDelegate,
                                                                     BitMask<Feature, uint32_t>(Feature::kPowerThreshold));
 
diff --git a/examples/energy-management-app/energy-management-common/src/MeterIdentificationDelegate.cpp b/examples/energy-management-app/energy-management-common/src/MeterIdentificationDelegate.cpp
@@ -31,6 +31,9 @@ using namespace chip::app::Clusters::MeterIdentification::Attributes;
 using chip::app::Clusters::MeterIdentification::MeterTypeEnum;
 using chip::app::Clusters::MeterIdentification::PowerThresholdSourceEnum;
 
+constexpr size_t kUtilityNameSize = 16;
+constexpr size_t kPointOfDeliverySize = 16;
+
 CHIP_ERROR MeterIdentificationInstance::Init()
 {
     return Instance::Init();
@@ -60,11 +63,11 @@ chip::app::Clusters::MeterIdentification::MeterIdentificationDelegate::~MeterIde
 
 void MeterIdentificationDelegate::Init()
 {
-    SetMeterType(MeterTypeEnum::kPrivate);
-    SetUtilityName(CharSpan::fromCharString("Test Utility Name"));
-    SetPointOfDelivery(CharSpan::fromCharString("Test PointOfDelivery"));
-    SetPowerThreshold(100);
-    SetPowerThresholdSource(PowerThresholdSourceEnum::kEquipment);
+    SetMeterType(std::nullopt);
+    SetUtilityName(std::nullopt);
+    SetPointOfDelivery(std::nullopt);
+    SetPowerThreshold(std::nullopt);
+    SetPowerThresholdSource(std::nullopt);
 }
 
 CHIP_ERROR MeterIdentificationDelegate::LoadJson(Json::Value & root)
@@ -164,11 +167,11 @@ CHIP_ERROR MeterIdentificationDelegate::SetUtilityName(DataModel::Nullable<CharS
 
     if (!newValue.IsNull())
     {
-        size_t len = newValue.Value().size();
-        char * str = (char *) chip::Platform::MemoryAlloc(len);
-        memcpy(str, newValue.Value().data(), len);
-        CharSpan nameString(str, len);
-        mUtilityName = MakeNullable(static_cast<CharSpan>(nameString));
+        size_t len = min(newValue.Value().size(), kUtilityNameSize);
+        char * str = (char *) chip::Platform::MemoryAlloc(len + 1);
+        strncpy(str, newValue.Value().data(), len);
+        str[len] = 0;
+        mUtilityName = MakeNullable(CharSpan::fromCharString(str));
     }
 
     // if (!oldValue.data_equal(newValue))
@@ -191,11 +194,11 @@ CHIP_ERROR MeterIdentificationDelegate::SetPointOfDelivery(DataModel::Nullable<C
 
     if (!newValue.IsNull())
     {
-        size_t len = newValue.Value().size();
-        char * str = (char *) chip::Platform::MemoryAlloc(len);
-        memcpy(str, newValue.Value().data(), len);
-        CharSpan nameString(str, len);
-        mPointOfDelivery = MakeNullable(static_cast<CharSpan>(nameString));
+        size_t len = min(newValue.Value().size(), kPointOfDeliverySize);
+        char * str = (char *) chip::Platform::MemoryAlloc(len + 1);
+        strncpy(str, newValue.Value().data(), len);
+        str[len] = 0;
+        mPointOfDelivery = MakeNullable(CharSpan::fromCharString(str));
     }
 
     // if (!oldValue.data_equal(newValue))
diff --git a/src/app/clusters/energy-calendar-server/energy-calendar-server.cpp b/src/app/clusters/energy-calendar-server/energy-calendar-server.cpp
diff --git a/src/app/clusters/energy-calendar-server/energy-calendar-server.h b/src/app/clusters/energy-calendar-server/energy-calendar-server.h

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,6 @@ chip::app::Clusters::EnergyCalendar::CalendarProviderInstance::~CalendarProvider`
`65`	`65`	`{`
`66`	`66`	`FreeMemoryCalendarPeriodStructList(mCalendarPeriods);`
`67`	`67`	`FreeMemoryDayStructList(mSpecialDays);`
`68`		`- if (!mName.IsNull())`
`69`		`- {`
`70`		`- chip::Platform::MemoryFree((void *) mName.Value().data());`
`71`		`- mName.SetNull();`
`72`		`- }`
`73`	`68`	`}`
`74`	`69`
`75`	`70`	`void CalendarProviderInstance::Init(void)`
`@@ -81,7 +76,7 @@ void CalendarProviderInstance::Init(void)`
`81`	`76`	`void CalendarProviderInstance::SetDefault(void)`
`82`	`77`	`{`
`83`	`78`	`SetCalendarID(std::nullopt);`
`84`		`- SetName(std::nullopt);`
	`79`	`+ SetName(nullptr);`
`85`	`80`	`SetProviderID(std::nullopt);`
`86`	`81`	`SetEventID(std::nullopt);`
`87`	`82`
`@@ -120,20 +115,14 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)`
`120`	`115`	`if (root.isMember("CalendarName"))`
`121`	`116`	`{`
`122`	`117`	`value = root.get("CalendarName", Json::Value());`
`123`		`- if (!mName.IsNull())`
	`118`	`+ if (value.isString())`
`124`	`119`	`{`
`125`		`- chip::Platform::MemoryFree((void *) mName.Value().data());`
`126`		`- mName.SetNull();`
	`120`	`+ SetName(value.asCString());`
`127`	`121`	`}`
`128`		`- if (value.isString())`
	`122`	`+ else`
`129`	`123`	`{`
`130`		`- size_t len = value.asString().size();`
`131`		`- char * str = (char *) chip::Platform::MemoryAlloc(len);`
`132`		`- memcpy(str, value.asCString(), len);`
`133`		`- CharSpan nameString(str, len);`
`134`		`- mName = MakeNullable(static_cast<CharSpan>(nameString));`
	`124`	`+ SetName(nullptr);`
`135`	`125`	`}`
`136`		`- SetName(mName);`
`137`	`126`	`}`
`138`	`127`
`139`	`128`	`if (root.isMember("ProviderID"))`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void emberAfMeterIdentificationClusterInitCallback(chip::EndpointId endpointId)`
`37`	`37`	`if (gMIDelegate)`
`38`	`38`	`{`
`39`	`39`	`gMIDelegate->Init();`
`40`		`-`
	`40`	`+`
`41`	`41`	`gMIInstance = std::make_unique<MeterIdentificationInstance>(endpointId, *gMIDelegate,`
`42`	`42`	`BitMask<Feature, uint32_t>(Feature::kPowerThreshold));`
`43`	`43`