Merge branch 'master' into add_event_min

project-chip · Mar 15, 2023 · efa3016 · efa3016
2 parents fda8ffd + 12bcb2c
commit efa3016
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 32 deletions.
diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
@@ -52,9 +52,6 @@ declare_args() {
   sl_wfx_config_softap = false
   sl_wfx_config_scan = true
 
-  # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = false
-
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false
 
@@ -266,10 +263,6 @@ efr32_executable("light_switch_app") {
       include_dirs += wf200_plat_incs
     }
 
-    if (chip_enable_wifi_ipv4) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
-    }
-
     if (rs91x_wpa3_only) {
       # TODO: Change this macro once WF200 support is provided
       defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]

diff --git a/examples/lighting-app/silabs/SiWx917/BUILD.gn b/examples/lighting-app/silabs/SiWx917/BUILD.gn
@@ -52,9 +52,6 @@ declare_args() {
   sl_wfx_config_softap = false
   sl_wfx_config_scan = true
 
-  # Argument to Disable IPv4 for wifi
-  chip_enable_wifi_ipv4 = false
-
   # Argument to force enable WPA3 security on rs91x
   rs91x_wpa3_only = false
 
@@ -266,10 +263,6 @@ efr32_executable("lighting_app") {
       include_dirs += wf200_plat_incs
     }
 
-    if (chip_enable_wifi_ipv4) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
-    }
-
     if (rs91x_wpa3_only) {
       # TODO: Change this macro once WF200 support is provided
       defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]

diff --git a/examples/lock-app/silabs/SiWx917/BUILD.gn b/examples/lock-app/silabs/SiWx917/BUILD.gn
@@ -52,9 +52,6 @@ declare_args() {
   sl_wfx_config_softap = false
   sl_wfx_config_scan = true
 
-  # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = false
-
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false
 
@@ -267,10 +264,6 @@ efr32_executable("lock_app") {
       include_dirs += wf200_plat_incs
     }
 
-    if (chip_enable_wifi_ipv4) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
-    }
-
     if (rs91x_wpa3_only) {
       # TODO: Change this macro once WF200 support is provided
       defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]

diff --git a/examples/pump-app/nrfconnect/main/PumpManager.cpp b/examples/pump-app/nrfconnect/main/PumpManager.cpp
@@ -50,12 +50,12 @@ void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callba
 
 bool PumpManager::IsActionInProgress()
 {
-    return (mState == kState_StartInitiated || mState == kState_StartInitiated) ? true : false;
+    return (mState == kState_StartInitiated);
 }
 
 bool PumpManager::IsStopped()
 {
-    return (mState == kState_StopCompleted) ? true : false;
+    return (mState == kState_StopCompleted);
 }
 
 void PumpManager::EnableAutoRestart(bool aOn)

diff --git a/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp b/examples/pump-controller-app/nrfconnect/main/PumpManager.cpp
@@ -50,12 +50,12 @@ void PumpManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callba
 
 bool PumpManager::IsActionInProgress()
 {
-    return (mState == kState_StartInitiated || mState == kState_StartInitiated) ? true : false;
+    return (mState == kState_StartInitiated);
 }
 
 bool PumpManager::IsStopped()
 {
-    return (mState == kState_StopCompleted) ? true : false;
+    return (mState == kState_StopCompleted);
 }
 
 void PumpManager::EnableAutoRestart(bool aOn)

diff --git a/examples/window-app/silabs/SiWx917/BUILD.gn b/examples/window-app/silabs/SiWx917/BUILD.gn
@@ -46,9 +46,6 @@ declare_args() {
   sl_wfx_config_softap = false
   sl_wfx_config_scan = true
 
-  # Argument to Disable IPv4 for wifi(rs911)
-  chip_enable_wifi_ipv4 = false
-
   # Argument to force enable WPA3 security
   rs91x_wpa3_only = false
 
@@ -257,10 +254,6 @@ efr32_executable("window_app") {
       include_dirs += wf200_plat_incs
     }
 
-    if (chip_enable_wifi_ipv4) {
-      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4" ]
-    }
-
     if (rs91x_wpa3_only) {
       # TODO: Change this macro once WF200 support is provided
       defines += [ "WIFI_ENABLE_SECURITY_WPA3=1" ]

diff --git a/third_party/silabs/SiWx917_sdk.gni b/third_party/silabs/SiWx917_sdk.gni
@@ -42,6 +42,9 @@ declare_args() {
   use_system_view = false
 
   silabs_log_enabled = true
+
+  # Argument to Disable IPv4 for wifi(rs911)
+  chip_enable_wifi_ipv4 = false
 }
 
 assert(efr32_sdk_root != "", "efr32_sdk_root must be specified")
@@ -143,6 +146,10 @@ template("efr32_sdk") {
 
     defines += board_defines
 
+    if (chip_enable_wifi_ipv4) {
+      defines += [ "CHIP_DEVICE_CONFIG_ENABLE_IPV4=1" ]
+    }
+
     # Enabling led interface
     if (use_wstk_leds) {
       defines += [ "ENABLE_WSTK_LEDS" ]