changed time logic to be able to set older time but not old than defa…

…ult LastKnownTime
project-chip · May 2, 2023 · 5a2291b · 5a2291b
1 parent ce8679c
commit 5a2291b
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -466,21 +466,19 @@ static bool utcTimeChanged(uint64_t utcTime)
 
     Server::GetInstance().GetFabricTable().GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpoch);
     System::SystemClock().GetClock_RealTime(realTime);
-    ChipLogError(Zcl, "UTCTime: %llu Last Known Good Time: %u Real Time: %llu", utcTime, lastKnownGoodChipEpoch.count(),
-                 realTime.count());
     chip::UnixEpochToChipEpochTime((uint32_t)(utcTime / chip::kMicrosecondsPerSecond), utcTimetoChipEpoch);
+    ChipLogProgress(Zcl, "UTC ChipEpoch Time: %u Last Known Good Time: %u Real Time: %llu", utcTimetoChipEpoch,
+                    lastKnownGoodChipEpoch.count(), realTime.count());
 
-    if (utcTimetoChipEpoch >= lastKnownGoodChipEpoch.count()) // update Last Known Good Time if a more recent time is obtained
-    {
-        Server::GetInstance().GetFabricTable().SetLastKnownGoodChipEpochTime(System::Clock::Seconds32(utcTimetoChipEpoch));
-        System::SystemClock().SetClock_RealTime(System::Clock::Microseconds64(utcTime));
+    VerifyOrReturnValue(Server::GetInstance().GetFabricTable().SetLastKnownGoodChipEpochTime(
+                            System::Clock::Seconds32(utcTimetoChipEpoch)) == CHIP_NO_ERROR,
+                        false);
+    VerifyOrReturnValue(System::SystemClock().SetClock_RealTime(System::Clock::Microseconds64(utcTime)) == CHIP_NO_ERROR, false);
 
-        Server::GetInstance().GetFabricTable().GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpoch);
-        System::SystemClock().GetClock_RealTime(realTime);
-        ChipLogError(Zcl, " Last Known Good Time: %u Real Time: %llu", lastKnownGoodChipEpoch.count(), realTime.count());
-        return true;
-    }
-    return false;
+    Server::GetInstance().GetFabricTable().GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpoch);
+    System::SystemClock().GetClock_RealTime(realTime);
+    ChipLogProgress(Zcl, " Last Known Good Time: %u Real Time: %llu", lastKnownGoodChipEpoch.count(), realTime.count());
+    return true;
 }
 
 bool emberAfTimeSynchronizationClusterSetUtcTimeCallback(