Implement scan parameters

This adds few profiles to control the scan using the scan parameters.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>

Author: krish2718

scan_bm/Kconfig

@@ -14,4 +14,115 @@ module = NR70_SCAN_BM_SAMPLE
 module-str = nRF70 BM scan sample
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
 
-endmenu
+config WIFI_MAC_ADDRESS
+	string "WiFi MAC address"
+	default "F6:CE:36:00:00:01"
+	help
+		Wi-Fi MAC address to be used by the sample. If not set, the sample will
+		use the default MAC address (locally administrative). This is only used
+		when the nRF7002 OTP is not programmed with a MAC address.
+
+config WIFI_SCAN_INTERVAL_S
+	int "Scan interval (seconds)"
+	default 10
+	help
+	  Specifies the scan interval in seconds.
+
+config WIFI_SCAN_BANDS_LIST
+	string "Frequency bands to scan"
+	default "2" if WIFI_SCAN_PROFILE_2_4GHz_ACTIVE || WIFI_SCAN_PROFILE_2_4GHz_PASSIVE || WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_CHAN
+	default "5" if WIFI_SCAN_PROFILE_5GHz_ACTIVE || WIFI_SCAN_PROFILE_5GHz_PASSIVE || WIFI_SCAN_PROFILE_5GHz_NON_DFS_CHAN
+	default "2,5" if WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_AND_5GHz_NON_DFS_CHAN
+	default ""
+	help
+	  Specifies the frequency bands to scan, as follows:
+	  2 - 2.4 GHz,
+	  5 - 5 GHz,
+	  6 - 6 GHz,
+	  "" - All bands allowed by the regulatory domain.
+	  Multiple bands can be specified as comma separated band values.
+	  Only regulatory domain permitted values are allowed.
+
+config WIFI_SCAN_CHAN_LIST
+	string "Channel list for scan"
+	default "2:1,6,11" if WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_CHAN
+	default "5:36,40,44,48,149,153,157,161,165" if WIFI_SCAN_PROFILE_5GHz_NON_DFS_CHAN
+	default "2:1,6,11_5:36,40,44,48,149,153,157,161,165" if WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_AND_5GHz_NON_DFS_CHAN
+	default ""
+	help
+	  Specifies the list of channels used to perform scan.
+
+config WIFI_SCAN_DWELL_TIME_ACTIVE
+	int "Active scan dwell time"
+	default 50
+	range 5 1000
+	help
+	  Active scan dwell time (in ms) per channel.
+
+config WIFI_SCAN_DWELL_TIME_PASSIVE
+	int "Passive scan dwell time"
+	default 130
+	range 10 1000
+	help
+	  Passive scan dwell time (in ms) per channel.
+
+choice
+	prompt "Choose a WiFi Scan Profile"
+
+config WIFI_SCAN_PROFILE_DEFAULT
+	bool "Scan in all bands and channels"
+	help
+	  Enable this profile to do Wi-Fi scan in all supported bands and channels.
+
+config WIFI_SCAN_PROFILE_ACTIVE
+	bool "Active scan"
+	help
+	  Enable this profile to do active scan where allowed.
+
+config WIFI_SCAN_PROFILE_PASSIVE
+	bool "Passive scan"
+	help
+	  Enable this profile to do passive scan on all channels.
+
+config WIFI_SCAN_PROFILE_2_4GHz_ACTIVE
+	bool "Scan in the 2.4 GHz band using active scan"
+	help
+	  Enable this profile to scan in the 2.4 GHz band using active scanning where allowed.
+
+config WIFI_SCAN_PROFILE_2_4GHz_PASSIVE
+	bool "Scan in the 2.4 GHz band using passive scan"
+	help
+	  Enable this profile to scan in the 2.4 GHz band using passive scanning on all channels.
+
+config WIFI_SCAN_PROFILE_5GHz_ACTIVE
+	bool "Scan in the 5 GHz band using active scan"
+	help
+	  Enable this profile to scan in the 5 GHz band using active scanning where allowed.
+
+config WIFI_SCAN_PROFILE_5GHz_PASSIVE
+	bool "Scan in the 5 GHz band using passive scan"
+	help
+	  Enable this profile to scan in the 5 GHz band using passive scanning on all channels.
+
+config WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_CHAN
+	bool "Scan only non-overlapping channels"
+	help
+	  Enable this profile to scan only non-overlapping channels (1, 6, 11)
+	  in the 2.4 GHz band.
+
+config WIFI_SCAN_PROFILE_5GHz_NON_DFS_CHAN
+	bool "Scan only non-DFS channels"
+	help
+	  Enable this profile to scan only non-DFS channels (36, 40, 44,
+	  48, 149, 153, 157, 161, 165) in the 5 GHz band.
+
+config WIFI_SCAN_PROFILE_2_4GHz_NON_OVERLAP_AND_5GHz_NON_DFS_CHAN
+	bool "Scan only non-overlapping and non-DFS channels"
+	help
+	  Enable this profile to scan only non-overlapping channels
+	  (1, 6, 11) in the 2.4 GHz band and non-DFS channels (36, 40, 44,
+	  48, 149, 153, 157, 161, 165) in the 5 GHz band.
+
+endchoice
+
+endmenu

scan_bm/prj.conf

@@ -7,6 +7,13 @@
 CONFIG_NRF70_BM_LIB=y
 CONFIG_MAIN_STACK_SIZE=4200
 
+# for Wi-Fi utils
+CONFIG_NETWORKING=y
+CONFIG_NET_MGMT=y
+CONFIG_NET_MGMT_EVENT=y
+CONFIG_NET_MGMT_EVENT_INFO=y
+CONFIG_NET_L2_WIFI_MGMT=y
+
 # Debugs
 CONFIG_LOG=y
 CONFIG_LOG_MODE_IMMEDIATE=y

scan_bm/src/main.c

@@ -11,6 +11,10 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
+#include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/wifi_utils.h>
+
+#include <stdlib.h>
 
 LOG_MODULE_REGISTER(nrf70_scan_bm, CONFIG_NR70_SCAN_BM_SAMPLE_LOG_LEVEL);
 
@@ -53,9 +57,43 @@ void scan_result_cb(struct nrf70_scan_result *entry)
 	   nrf70_mfp_txt(entry->mfp));
 }
 
+static int prepare_scan_params(struct nrf70_scan_params *params)
+{
+	int band_str_len = sizeof(CONFIG_WIFI_SCAN_BANDS_LIST);
+
+	if (band_str_len - 1) {
+		char *buf = malloc(band_str_len);
+
+		if (!buf) {
+			LOG_ERR("Malloc Failed");
+			return -EINVAL;
+		}
+		strcpy(buf, CONFIG_WIFI_SCAN_BANDS_LIST);
+		if (wifi_utils_parse_scan_bands(buf, &params->bands)) {
+			LOG_ERR("Incorrect value(s) in CONFIG_WIFI_SCAN_BANDS_LIST: %s",
+					CONFIG_WIFI_SCAN_BANDS_LIST);
+			free(buf);
+			return -ENOEXEC;
+		}
+		free(buf);
+	}
+
+	if (sizeof(CONFIG_WIFI_SCAN_CHAN_LIST) - 1) {
+		if (wifi_utils_parse_scan_chan(CONFIG_WIFI_SCAN_CHAN_LIST,
+						(struct wifi_band_channel *)params->band_chan,
+						ARRAY_SIZE(params->band_chan))) {
+			LOG_ERR("Incorrect value(s) in CONFIG_WIFI_SCAN_CHAN_LIST: %s",
+					CONFIG_WIFI_SCAN_CHAN_LIST);
+			return -ENOEXEC;
+		}
+	}
+
+	return 0;
+}
+
 int main(void)
 {
-	//struct nrf70_scan_params scan_params = { 0 };
+	struct nrf70_scan_params scan_params = { 0 };
 	int ret;
 
 	LOG_INF("WiFi scan sample application using nRF70 Bare Metal library");
@@ -65,10 +103,13 @@ int main(void)
 
 	LOG_INF("Scanning for WiFi networks...");
 
+	// Prepare scan parameters
+	CHECK_RET(prepare_scan_params(&scan_params));
+
 	while (1)
 	{
 		// Start scanning for WiFi networks
-		CHECK_RET(nrf70_scan_start(NULL, scan_result_cb));
+		CHECK_RET(nrf70_scan_start(&scan_params, scan_result_cb));
 
 		// Wait for the scan to complete or timeout
 		unsigned int timeout = 30000;