diff --git a/examples/light-switch-app/silabs/openthread.gni b/examples/light-switch-app/silabs/openthread.gni index 2ea7cd471c2b8a..17cc5885460379 100644 --- a/examples/light-switch-app/silabs/openthread.gni +++ b/examples/light-switch-app/silabs/openthread.gni @@ -35,6 +35,6 @@ sl_ot_idle_interval_ms = 15000 # 15s Idle Intervals sl_ot_active_interval_ms = 500 # 500ms Active Intervals # ICD Matter Configuration flags -sl_idle_mode_interval_s = 3600 # 60min Idle Mode Interval -sl_active_mode_interval_ms = 60000 # 60s Active Mode Interval +sl_idle_mode_duration_s = 3600 # 60min Idle Mode Duration +sl_active_mode_duration_ms = 60000 # 60s Active Mode Duration sl_active_mode_threshold_ms = 1000 # 1s Active Mode Threshold diff --git a/examples/lit-icd-app/silabs/build_for_wifi_args.gni b/examples/lit-icd-app/silabs/build_for_wifi_args.gni index 630cb65b53f45d..139297d45a03db 100644 --- a/examples/lit-icd-app/silabs/build_for_wifi_args.gni +++ b/examples/lit-icd-app/silabs/build_for_wifi_args.gni @@ -30,6 +30,6 @@ sl_use_subscription_synching = true icd_enforce_sit_slow_poll_limit = true # ICD Matter Configuration flags -sl_idle_mode_interval_s = 3600 # 60min Idle Mode Interval -sl_active_mode_interval_ms = 0 # 0 Active Mode Interval +sl_idle_mode_duration_s = 3600 # 60min Idle Mode Duration +sl_active_mode_duration_ms = 0 # 0 Active Mode Duration sl_active_mode_threshold_ms = 30000 # 30s Active Mode Threshold diff --git a/examples/lit-icd-app/silabs/openthread.gni b/examples/lit-icd-app/silabs/openthread.gni index 69bd7b88e6bdc6..8a3bb36475c49c 100644 --- a/examples/lit-icd-app/silabs/openthread.gni +++ b/examples/lit-icd-app/silabs/openthread.gni @@ -38,6 +38,6 @@ sl_ot_idle_interval_ms = 3600000 # 60mins Idle Polling Interval sl_ot_active_interval_ms = 1000 # 1000ms Active Polling Interval # ICD Matter Configuration flags -sl_idle_mode_interval_s = 3600 # 60min Idle Mode Interval -sl_active_mode_interval_ms = 0 # 0 Active Mode Interval +sl_idle_mode_duration_s = 3600 # 60min Idle Mode Duration +sl_active_mode_duration_ms = 0 # 0 Active Mode Duration sl_active_mode_threshold_ms = 5000 # 5s Active Mode Threshold diff --git a/examples/lock-app/silabs/build_for_wifi_args.gni b/examples/lock-app/silabs/build_for_wifi_args.gni index a9a7ee66170687..25c5a2435d332f 100644 --- a/examples/lock-app/silabs/build_for_wifi_args.gni +++ b/examples/lock-app/silabs/build_for_wifi_args.gni @@ -27,6 +27,6 @@ chip_subscription_timeout_resumption = false sl_use_subscription_synching = true # ICD Matter Configuration flags -sl_idle_mode_interval_s = 600 # 10min Idle Mode Interval -sl_active_mode_interval_ms = 10000 # 10s Active Mode Interval +sl_idle_mode_duration_s = 600 # 10min Idle Mode Duration +sl_active_mode_duration_ms = 10000 # 10s Active Mode Duration sl_active_mode_threshold_ms = 1000 # 1s Active Mode Threshold diff --git a/examples/lock-app/silabs/openthread.gni b/examples/lock-app/silabs/openthread.gni index cde56f8029f6da..3bfa566596aeaf 100644 --- a/examples/lock-app/silabs/openthread.gni +++ b/examples/lock-app/silabs/openthread.gni @@ -35,6 +35,6 @@ sl_ot_idle_interval_ms = 5000 # 5s Idle Intervals sl_ot_active_interval_ms = 500 # 500ms Active Intervals # ICD Matter Configuration flags -sl_idle_mode_interval_s = 600 # 10min Idle Mode Interval -sl_active_mode_interval_ms = 10000 # 10s Active Mode Interval +sl_idle_mode_duration_s = 600 # 10min Idle Mode Duration +sl_active_mode_duration_ms = 10000 # 10s Active Mode Duration sl_active_mode_threshold_ms = 1000 # 1s Active Mode Threshold diff --git a/examples/window-app/silabs/openthread.gni b/examples/window-app/silabs/openthread.gni index cdd7f8c0f1f42e..d3d50ab878b211 100644 --- a/examples/window-app/silabs/openthread.gni +++ b/examples/window-app/silabs/openthread.gni @@ -36,6 +36,6 @@ sl_ot_idle_interval_ms = 1000 # 1s Idle Intervals sl_ot_active_interval_ms = 500 # 500ms Active Intervals # ICD Matter Configuration flags -sl_idle_mode_interval_s = 600 # 10min Idle Mode Interval -sl_active_mode_interval_ms = 0 # 0s Active Mode Interval +sl_idle_mode_duration_s = 600 # 10min Idle Mode Duration +sl_active_mode_duration_ms = 0 # 0s Active Mode Duration sl_active_mode_threshold_ms = 0 # 1s Active Mode Threshold diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h index d602273a8611a9..71070c357147df 100644 --- a/src/app/ReadHandler.h +++ b/src/app/ReadHandler.h @@ -275,7 +275,7 @@ class ReadHandler : public Messaging::ExchangeDelegate /** * Returns SUBSCRIPTION_MAX_INTERVAL_PUBLISHER_LIMIT - * For an ICD publisher, this SHALL be set to the idle mode interval. + * For an ICD publisher, this SHALL be set to the idle mode duration. * Otherwise, this SHALL be set to 60 minutes. */ uint16_t GetPublisherSelectedIntervalLimit(); diff --git a/src/app/reporting/SynchronizedReportSchedulerImpl.cpp b/src/app/reporting/SynchronizedReportSchedulerImpl.cpp index 1620d9d70e6bbc..a807469b34f910 100644 --- a/src/app/reporting/SynchronizedReportSchedulerImpl.cpp +++ b/src/app/reporting/SynchronizedReportSchedulerImpl.cpp @@ -51,7 +51,7 @@ void SynchronizedReportSchedulerImpl::OnTransitionToIdle() VerifyOrReturn(now >= mNextReportTimestamp); if (((mNextReportTimestamp - now) < Seconds16(targetIdleInterval)) && (now > mNextMinTimestamp)) { - // If the next report is due in less than the idle mode interval and we are past the min interval, we can just send it now + // If the next report is due in less than the idle mode duration and we are past the min interval, we can just send it now CancelReport(); TimerFired(); } diff --git a/src/platform/silabs/CHIPPlatformConfig.h b/src/platform/silabs/CHIPPlatformConfig.h index 5fc9abfa995a3b..93faf6b791b697 100644 --- a/src/platform/silabs/CHIPPlatformConfig.h +++ b/src/platform/silabs/CHIPPlatformConfig.h @@ -95,11 +95,11 @@ #ifdef SL_ICD_ENABLED #ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC -#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC SL_IDLE_MODE_INTERVAL +#define CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC SL_IDLE_MODE_DURATION_S #endif // CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS -#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS SL_ACTIVE_MODE_INTERVAL +#define CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS SL_ACTIVE_MODE_DURATION_MS #endif // CHIP_CONFIG_ICD_ACTIVE_MODE_DURATION_MS #ifndef CHIP_CONFIG_ICD_ACTIVE_MODE_THRESHOLD_MS diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni index fd560b150c0d53..f3bf92d768d543 100644 --- a/third_party/silabs/SiWx917_sdk.gni +++ b/third_party/silabs/SiWx917_sdk.gni @@ -267,8 +267,8 @@ template("siwx917_sdk") { defines += [ "SL_ICD_ENABLED=1", "SL_ACTIVE_MODE_THRESHOLD=${sl_active_mode_threshold_ms}", - "SL_ACTIVE_MODE_INTERVAL=${sl_active_mode_interval_ms}", - "SL_IDLE_MODE_INTERVAL=${sl_idle_mode_interval_s}", + "SL_ACTIVE_MODE_DURATION_MS=${sl_active_mode_duration_ms}", + "SL_IDLE_MODE_DURATION_S=${sl_idle_mode_duration_s}", "SL_ICD_SUPPORTED_CLIENTS_PER_FABRIC=${sl_icd_supported_clients_per_fabric}", "SL_SI91X_MCU_WIRELESS_BASED_WAKEUP=1", "SL_SI91X_MCU_BUTTON_BASED_WAKEUP=1", diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni index 415f89b4db04fb..bed0a1e43c308d 100644 --- a/third_party/silabs/efr32_sdk.gni +++ b/third_party/silabs/efr32_sdk.gni @@ -54,8 +54,8 @@ declare_args() { sl_ot_csl_timeout_sec = 30 # 30s CSL timeout # ICD Matter Configuration flags - sl_idle_mode_interval_s = 600 # 10min Idle Mode Interval - sl_active_mode_interval_ms = 1000 # 1s Active Mode Interval + sl_idle_mode_duration_s = 600 # 10min Idle Mode Duration + sl_active_mode_duration_ms = 1000 # 1s Active Mode Duration sl_active_mode_threshold_ms = 500 # 500ms Active Mode Threshold sl_icd_supported_clients_per_fabric = 2 # 2 registration slots per fabric sl_use_subscription_synching = false @@ -420,8 +420,8 @@ template("efr32_sdk") { defines += [ "SL_ICD_ENABLED=1", "SL_ACTIVE_MODE_THRESHOLD=${sl_active_mode_threshold_ms}", - "SL_ACTIVE_MODE_INTERVAL=${sl_active_mode_interval_ms}", - "SL_IDLE_MODE_INTERVAL=${sl_idle_mode_interval_s}", + "SL_ACTIVE_MODE_DURATION_MS=${sl_active_mode_duration_ms}", + "SL_IDLE_MODE_DURATION_S=${sl_idle_mode_duration_s}", "SL_ICD_SUPPORTED_CLIENTS_PER_FABRIC=${sl_icd_supported_clients_per_fabric}", ]