Address review comments

mkardous-silabs · Aug 22, 2023 · 3f7a321 · 3f7a321
1 parent 12bfd8f
commit 3f7a321
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/app/icd/ICDManager.cpp b/src/app/icd/ICDManager.cpp
@@ -127,9 +127,8 @@ void ICDManager::UpdateOperationState(OperationalState state)
     if (state == OperationalState::IdleMode)
     {
         mOperationalState = OperationalState::IdleMode;
-        uint32_t idleModeInterval =
-            (IcdManagementServer::GetInstance().GetIdleModeInterval() * 1000); // convert IdleModeInterval from s to ms
-        DeviceLayer::SystemLayer().StartTimer(System::Clock::Timeout(idleModeInterval), OnIdleModeDone, this);
+        uint32_t idleModeInterval = IcdManagementServer::GetInstance().GetIdleModeInterval();
+        DeviceLayer::SystemLayer().StartTimer(System::Clock::Seconds32(idleModeInterval), OnIdleModeDone, this);
 
         System::Clock::Milliseconds32 slowPollInterval = GetSlowPollingInterval();
 

diff --git a/src/app/icd/IcdManagementServer.h b/src/app/icd/IcdManagementServer.h
@@ -66,10 +66,21 @@ class IcdManagementServer
     IcdManagementServer() = default;
 
     static IcdManagementServer mInstance;
-    uint32_t mIdleInterval           = CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL;    // in seconds
+
+    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL) <= 64800, "Spec requires the IdleModeInterval to be equal or inferior to 64800s.");
+    static_assert((CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL) >= 1, "Spec requires the IdleModeInterval to be equal or greater to 1s.");
+    uint32_t mIdleInterval           = CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL;    // in seconds.
+
+    static_assert((CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL) <= (CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL * 1000), "Spec requires the IdleModeInterval be equal or greater to the ActiveModeInterval.");
+    static_assert((CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL) >= 300, "Spec requires the ActiveModeThreshold to be equal or greater to 300ms");
     uint32_t mActiveInterval         = CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL;  // in milliseconds
+
+    static_assert((CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD) >= 300, "Spec requires the ActiveModeThreshold to be equal or greater to 300ms.");
     uint16_t mActiveThreshold        = CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD; // in milliseconds
+
     uint32_t mIcdCounter             = 0;
+
+    static_assert((CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC) >= 1, "Spec requires the minimum of supported clients per fabric be equal or greater to 1.");
     uint16_t mFabricClientsSupported = CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC;
 };