stop using attribute storage for TimeSource to make the code more

suitable for unit testing
project-chip · Apr 12, 2024 · 85b8e13 · 85b8e13
1 parent 6ff3e0a
commit 85b8e13
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 82 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -7590,7 +7590,7 @@ endpoint 0 {
     emits event MissingTrustedTimeSource;
     callback attribute UTCTime;
     callback attribute granularity;
-    ram      attribute timeSource default = 0x00;
+    callback attribute timeSource;
     callback attribute trustedTimeSource;
     callback attribute defaultNTP;
     callback attribute timeZone;

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
@@ -4915,10 +4915,10 @@
               "side": "server",
               "type": "TimeSourceEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -2778,7 +2778,7 @@ endpoint 0 {
     emits event MissingTrustedTimeSource;
     callback attribute UTCTime;
     callback attribute granularity;
-    ram      attribute timeSource default = 0x00;
+    callback attribute timeSource;
     callback attribute trustedTimeSource;
     callback attribute defaultNTP;
     callback attribute timeZone;

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -3599,10 +3599,10 @@
               "side": "server",
               "type": "TimeSourceEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0x00",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -378,12 +378,8 @@ void TimeSynchronizationServer::OnTimeSyncCompletionFn(TimeSourceEnum timeSource
         }
         return;
     }
-    mGranularity  = granularity;
-    Status status = TimeSource::Set(kRootEndpointId, timeSource);
-    if (!(status == Status::Success || status == Status::UnsupportedAttribute))
-    {
-        ChipLogError(Zcl, "Writing TimeSource failed.");
-    }
+    mGranularity = granularity;
+    mTimeSource  = timeSource;
 }
 
 void TimeSynchronizationServer::OnFallbackNTPCompletionFn(bool timeSyncSuccessful)
@@ -392,11 +388,7 @@ void TimeSynchronizationServer::OnFallbackNTPCompletionFn(bool timeSyncSuccessfu
     {
         mGranularity = GranularityEnum::kMillisecondsGranularity;
         // Non-matter SNTP because we know it's external and there's only one source
-        Status status = TimeSource::Set(kRootEndpointId, TimeSourceEnum::kNonMatterSNTP);
-        if (!(status == Status::Success || status == Status::UnsupportedAttribute))
-        {
-            ChipLogError(Zcl, "Writing TimeSource failed.");
-        }
+        mTimeSource = TimeSourceEnum::kNonMatterSNTP;
     }
     else
     {
@@ -791,13 +783,8 @@ CHIP_ERROR TimeSynchronizationServer::SetUTCTime(EndpointId ep, uint64_t utcTime
         return err;
     }
     GetDelegate()->UTCTimeAvailabilityChanged(utcTime);
-    mGranularity  = static_cast<GranularityEnum>(to_underlying(granularity) - 1);
-    Status status = TimeSource::Set(ep, source);
-    if (!(status == Status::Success || status == Status::UnsupportedAttribute))
-    {
-        ChipLogError(Zcl, "Writing TimeSource failed.");
-        return StatusIB(status).ToChipError();
-    }
+    mGranularity = static_cast<GranularityEnum>(to_underlying(granularity) - 1);
+    mTimeSource  = source;
     return CHIP_NO_ERROR;
 }
 

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.h b/src/app/clusters/time-synchronization-server/time-synchronization-server.h
@@ -27,7 +27,6 @@
 #include <app/AppConfig.h>
 #include <app/server/Server.h>
 #include <app/util/af-types.h>
-#include <app/util/config.h>
 #include <credentials/FabricTable.h>
 #include <lib/core/TLV.h>
 
@@ -137,6 +136,7 @@ class TimeSynchronizationServer : public FabricTable::Delegate
     TimeSyncDataProvider::TimeZoneObj mTimeZoneObj{ Span<TimeSyncDataProvider::TimeZoneStore>(mTz), 0 };
     TimeSyncDataProvider::DSTOffsetObj mDstOffsetObj{ DataModel::List<Structs::DSTOffsetStruct::Type>(mDst), 0 };
     GranularityEnum mGranularity = GranularityEnum::kNoTimeGranularity;
+    TimeSourceEnum mTimeSource   = TimeSourceEnum::kNone;
 
     TimeSyncDataProvider::TimeZoneStore mTz[CHIP_CONFIG_TIME_ZONE_LIST_MAX_SIZE];
     Structs::DSTOffsetStruct::Type mDst[CHIP_CONFIG_DST_OFFSET_LIST_MAX_SIZE];

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -382,7 +382,8 @@
             "LocalTime",
             "Granularity",
             "TimeZoneListMaxSize",
-            "DSTOffsetListMaxSize"
+            "DSTOffsetListMaxSize",
+            "TimeSource"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
         "Dishwasher Mode": [

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -380,7 +380,8 @@
             "LocalTime",
             "Granularity",
             "TimeZoneListMaxSize",
-            "DSTOffsetListMaxSize"
+            "DSTOffsetListMaxSize",
+            "TimeSource"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
         "Dishwasher Mode": [

diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h