[SL-UP] Rename ot interval to transport interval (project-chip#108)

shgutte · Nov 15, 2024 · 4a242e4 · 4a242e4
1 parent 2dccf95
commit 4a242e4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/examples/light-switch-app/silabs/openthread.gni b/examples/light-switch-app/silabs/openthread.gni
@@ -36,8 +36,8 @@ chip_subscription_timeout_resumption = false
 sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
-sl_ot_idle_interval_ms = 2100000  # 35 minutes Idle Intervals
-sl_ot_active_interval_ms = 1000  # 1000ms Active Intervals
+sl_transport_idle_interval_ms = 2100000  # 35 minutes Idle Intervals
+sl_transport_active_interval_ms = 1000  # 1000ms Active Intervals
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 1800  # 30min Idle Mode Duration

diff --git a/examples/lit-icd-app/silabs/openthread.gni b/examples/lit-icd-app/silabs/openthread.gni
@@ -37,8 +37,8 @@ chip_enable_icd_lit = true
 chip_enable_icd_dsls = true
 
 # Openthread Configuration flags
-sl_ot_idle_interval_ms = 3600000  # 60mins Idle Polling Interval
-sl_ot_active_interval_ms = 1000  # 1000ms Active Polling Interval
+sl_transport_idle_interval_ms = 3600000  # 60mins Idle Polling Interval
+sl_transport_active_interval_ms = 1000  # 1000ms Active Polling Interval
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 3600  # 60min Idle Mode Duration

diff --git a/examples/lock-app/silabs/openthread.gni b/examples/lock-app/silabs/openthread.gni
@@ -33,8 +33,8 @@ chip_subscription_timeout_resumption = false
 sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
-sl_ot_idle_interval_ms = 5000  # 5s Idle Intervals
-sl_ot_active_interval_ms = 500  # 500ms Active Intervals
+sl_transport_idle_interval_ms = 5000  # 5s Idle Intervals
+sl_transport_active_interval_ms = 500  # 500ms Active Intervals
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 600  # 10min Idle Mode Duration

diff --git a/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h b/examples/platform/silabs/efr32/project_include/OpenThreadConfig.h
@@ -40,7 +40,7 @@
 #define OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE 0
 
 // In seconds
-#define SL_MLE_TIMEOUT_s (SL_OT_IDLE_INTERVAL / 1000)
+#define SL_MLE_TIMEOUT_s (SL_TRANSPORT_IDLE_INTERVAL / 1000)
 
 // Timeout after 2 missed checkin or 4 mins if sleep interval is too short.
 #define OPENTHREAD_CONFIG_MLE_CHILD_TIMEOUT_DEFAULT ((SL_MLE_TIMEOUT_s < 120) ? 240 : ((SL_MLE_TIMEOUT_s * 2) + 1))

diff --git a/examples/smoke-co-alarm-app/silabs/openthread.gni b/examples/smoke-co-alarm-app/silabs/openthread.gni
@@ -36,8 +36,8 @@ chip_icd_report_on_active_mode = true
 chip_enable_icd_lit = true
 
 # Openthread Configuration flags
-sl_ot_idle_interval_ms = 3600000  # 60mins Idle Polling Interval
-sl_ot_active_interval_ms = 1000  # 1000ms Active Polling Interval
+sl_transport_idle_interval_ms = 3600000  # 60mins Idle Polling Interval
+sl_transport_active_interval_ms = 1000  # 1000ms Active Polling Interval
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 3600  # 60min Idle Mode Duration

diff --git a/examples/window-app/silabs/openthread.gni b/examples/window-app/silabs/openthread.gni
@@ -33,8 +33,8 @@ chip_subscription_timeout_resumption = false
 sl_use_subscription_syncing = true
 
 # Openthread Configuration flags
-sl_ot_idle_interval_ms = 1000  # 1s Idle Intervals
-sl_ot_active_interval_ms = 500  # 500ms Active Intervals
+sl_transport_idle_interval_ms = 1000  # 1s Idle Intervals
+sl_transport_active_interval_ms = 500  # 500ms Active Intervals
 
 # ICD Matter Configuration flags
 sl_idle_mode_duration_s = 600  # 10min Idle Mode Duration

diff --git a/src/platform/silabs/CHIPDevicePlatformConfig.h b/src/platform/silabs/CHIPDevicePlatformConfig.h
@@ -159,10 +159,10 @@
 
 #if SL_ICD_ENABLED
 #ifndef CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL
-#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL chip::System::Clock::Milliseconds32(SL_OT_IDLE_INTERVAL)
+#define CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL chip::System::Clock::Milliseconds32(SL_TRANSPORT_IDLE_INTERVAL)
 #endif // CHIP_DEVICE_CONFIG_ICD_SLOW_POLL_INTERVAL
 
 #ifndef CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL
-#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL chip::System::Clock::Milliseconds32(SL_OT_ACTIVE_INTERVAL)
+#define CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL chip::System::Clock::Milliseconds32(SL_TRANSPORT_ACTIVE_INTERVAL)
 #endif // CHIP_DEVICE_CONFIG_ICD_FAST_POLL_INTERVAL
 #endif // SL_ICD_ENABLED
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -53,8 +53,8 @@ declare_args() {
   sl_matter_ble_extended_adv = false
 
   # ICD Openthread Configuration flags
-  sl_ot_idle_interval_ms = 15000  # 15s Idle Intervals
-  sl_ot_active_interval_ms = 200  # 200ms Active Intervals
+  sl_transport_idle_interval_ms = 15000  # 15s Idle Intervals
+  sl_transport_active_interval_ms = 200  # 200ms Active Intervals
 
   # SSED Specific configurations
   sl_ot_csl_timeout_sec = 30  # 30s CSL timeout
@@ -630,15 +630,12 @@ template("efr32_sdk") {
         "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_TRANSPORT_IDLE_INTERVAL=${sl_transport_idle_interval_ms}",
+        "SL_TRANSPORT_ACTIVE_INTERVAL=${sl_transport_active_interval_ms}",
       ]
 
       if (defined(invoker.chip_enable_openthread) &&
           invoker.chip_enable_openthread) {
-        defines += [
-          "SL_OT_IDLE_INTERVAL=${sl_ot_idle_interval_ms}",
-          "SL_OT_ACTIVE_INTERVAL=${sl_ot_active_interval_ms}",
-        ]
-
         if (enable_synchronized_sed) {
           defines += [
             "CHIP_DEVICE_CONFIG_THREAD_SSED=1",