From 8395455da62f58836bd82f8c51ac269eb607f7e2 Mon Sep 17 00:00:00 2001
From: Thirsrin <108743108+Thirsrin@users.noreply.github.com>
Date: Wed, 15 Mar 2023 06:47:55 +0530
Subject: [PATCH 1/2] removed ipv4 flag from example build gn files and added
 in siw917 sdk gni file (#25675)

---
 examples/light-switch-app/silabs/SiWx917/BUILD.gn | 7 -------
 examples/lighting-app/silabs/SiWx917/BUILD.gn     | 7 -------
 examples/lock-app/silabs/SiWx917/BUILD.gn         | 7 -------
 examples/window-app/silabs/SiWx917/BUILD.gn       | 7 -------
 third_party/silabs/SiWx917_sdk.gni                | 7 +++++++
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/examples/light-switch-app/silabs/SiWx917/BUILD.gn b/examples/light-switch-app/silabs/SiWx917/BUILD.gn
index 28c7ba6de5424b..ff51ce6d0d740e 100644
--- 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
index 1a6b730e0be5ce..8d34b583966d08 100644
--- 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
index 3c83b84fa19b1d..6d172ef773be91 100644
--- 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/window-app/silabs/SiWx917/BUILD.gn b/examples/window-app/silabs/SiWx917/BUILD.gn
index b624fdf1947f1a..4a7b7921d8b91a 100644
--- 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
index 6970fe73bee19f..648e0be90bf415 100644
--- 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" ]

From 12bcb2c636e23724ca6f56d679de416f37e6a59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Josefsen?=
 <69624991+ReneJosefsen@users.noreply.github.com>
Date: Wed, 15 Mar 2023 02:18:18 +0100
Subject: [PATCH 2/2] [Examples] Remove identical condition (#25660)

* Removed identical condition

* Optimized return statements
---
 examples/pump-app/nrfconnect/main/PumpManager.cpp            | 4 ++--
 examples/pump-controller-app/nrfconnect/main/PumpManager.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/pump-app/nrfconnect/main/PumpManager.cpp b/examples/pump-app/nrfconnect/main/PumpManager.cpp
index 1709e19fd32ff2..bcbe1f9d905f18 100644
--- 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
index 64e848a56a312d..2446db1442eb15 100644
--- 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)