Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ICD configurations to duration to match the SDK #32109

Merged
merged 1 commit into from
Feb 13, 2024
Merged

Rename ICD configurations to duration to match the SDK #32109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/light-switch-app/silabs/openthread.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/lit-icd-app/silabs/build_for_wifi_args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/lit-icd-app/silabs/openthread.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/lock-app/silabs/build_for_wifi_args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/lock-app/silabs/openthread.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/window-app/silabs/openthread.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/app/ReadHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/app/reporting/SynchronizedReportSchedulerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
4 changes: 2 additions & 2 deletions src/platform/silabs/CHIPPlatformConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions third_party/silabs/SiWx917_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions third_party/silabs/efr32_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}",
]

Expand Down
Loading