ESP32: Add unit suffixes for the intervals and threshold

project-chip · Sep 25, 2023 · c65b8ea · c65b8ea
1 parent e6abf86
commit c65b8ea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -310,7 +310,7 @@ menu "CHIP Device Layer"
             help
                 Enables or Disables ICD server
 
-        config ICD_SLOW_POLL_INTERVAL
+        config ICD_SLOW_POLL_INTERVAL_MS
             int "ICD Slow Polling Interval(ms)"
             depends on ENABLE_ICD_SERVER
             default 5000
@@ -319,7 +319,7 @@ menu "CHIP Device Layer"
                 messages in Idle Mode. The Slow Polling interval MAY be the same as the Idle Mode
                 Interval.
 
-        config ICD_FAST_POLL_INTERVAL
+        config ICD_FAST_POLL_INTERVAL_MS
             int "ICD Fast Polling Interval(ms)"
             depends on ENABLE_ICD_SERVER
             default 200
@@ -328,23 +328,23 @@ menu "CHIP Device Layer"
                 in Active Mode. The Fast Polling interval SHALL be smaller than the Active Mode
                 Interval.
 
-        config ICD_IDLE_MODE_INTERVAL
-            int "ICD Idle Mode Interval(s)"
+        config ICD_IDLE_MODE_INTERVAL_SEC
+            int "ICD Idle Mode Interval(sec)"
             depends on ENABLE_ICD_SERVER
             default 2
             help
                 This value indicates the maximum interval in seconds the server can stay in idle
                 mode.
 
-        config ICD_ACTIVE_MODE_INTERVAL
+        config ICD_ACTIVE_MODE_INTERVAL_MS
             int "ICD Active Mode Interval(ms)"
             depends on ENABLE_ICD_SERVER
             default 300
             help
                 This value indicates the minimum interval in milliseconds the server can stay in
                 active mode.
 
-        config ICD_ACTIVE_MODE_THRESHOLD
+        config ICD_ACTIVE_MODE_THRESHOLD_MS
             int "ICD Active Mode Threshold(ms)"
             depends on ENABLE_ICD_SERVER
             default 300

diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -74,8 +74,8 @@
 #endif // CONFIG_IDF_TARGET_ESP32H2
 
 #if CONFIG_ENABLE_ICD_SERVER
-#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL chip::System::Clock::Milliseconds32(CONFIG_ICD_SLOW_POLL_INTERVAL)
-#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL chip::System::Clock::Milliseconds32(CONFIG_ICD_FAST_POLL_INTERVAL)
+#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL chip::System::Clock::Milliseconds32(CONFIG_ICD_SLOW_POLL_INTERVAL_MS)
+#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL chip::System::Clock::Milliseconds32(CONFIG_ICD_FAST_POLL_INTERVAL_MS)
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE CONFIG_ENABLE_CHIPOBLE

diff --git a/src/platform/ESP32/CHIPPlatformConfig.h b/src/platform/ESP32/CHIPPlatformConfig.h
@@ -78,17 +78,17 @@
 
 #if CONFIG_ENABLE_ICD_SERVER
 
-#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL CONFIG_ICD_IDLE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL
+#ifndef CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#define CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
+#endif // CHIP_CONFIG_ICD_IDLE_MODE_INTERVAL_SEC
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL CONFIG_ICD_ACTIVE_MODE_INTERVAL
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_INTERVAL_MS
 
-#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD
-#define CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD CONFIG_ICD_ACTIVE_MODE_THRESHOLD
-#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD
+#ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
+#define CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
+#endif // CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS
 
 #ifndef CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC
 #define CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC