net: lib: nrf_cloud: add kconfig opts for Wi-Fi location req encoding

Add Kconfig choice `NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT` to control the
data included in  Wi-Fi location requests.
By default, requests now include only the MAC and RSSI.
IRIS-6815

Signed-off-by: Justin Morton <[email protected]>

Author: jayteemo

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -643,12 +643,14 @@ Libraries for networking
     * Support for CoAP CBOR type handling to nrf_cloud_obj.
     * Warning message discouraging use of :kconfig:option:`CONFIG_NRF_CLOUD_PROVISION_CERTIFICATES` for purposes other than testing.
     * Reporting of protocol (MQTT, REST, or CoAP) as well as method (LTE or Wi-Fi) to the device shadow.
+    * Kconfig choice :kconfig:option:`NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT` for selecting the data that is encoded in Wi-Fi location requests.
 
   * Updated:
 
     * Moved JSON manipulation from :file:`nrf_cloud_fota.c` to :file:`nrf_cloud_codec_internal.c`.
     * :c:func:`nrf_cloud_obj_location_request_create` to use the new function :c:func:`nrf_cloud_obj_location_request_payload_add`.
     * Retry handling for P-GPS data download errors to retry ``ECONNREFUSED`` errors.
+    * By default, Wi-Fi location requests include only the MAC address and RSSI value.
 
   * Fixed:
 

subsys/net/lib/nrf_cloud/Kconfig

@@ -74,6 +74,27 @@ config NRF_CLOUD_DEVICE_STATUS_ENCODE_VOLTAGE
 	depends on MODEM_INFO_ADD_DEVICE
 	default y
 
+choice NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT
+	prompt "Encoding options for Wi-Fi location requests"
+	default NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_MAC_RSSI
+
+config NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_MAC_ONLY
+	bool "Encode only the MAC address"
+	help
+		The MAC address is the only required parameter.
+
+config NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_MAC_RSSI
+	bool "Encode the MAC address and the RSSI value"
+	help
+		The RSSI value may improve location accuracy.
+
+config NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_ALL
+	bool "Encode all available parameters"
+	help
+		This option increases the memory required for creating requests.
+		It also increases the amount of data sent to nRF Cloud.
+endchoice
+
 endif
 
 if NRF_CLOUD_AGPS || NRF_CLOUD_PGPS

subsys/net/lib/nrf_cloud/src/nrf_cloud_codec_internal.c

@@ -2666,6 +2666,9 @@ int nrf_cloud_wifi_req_json_encode(struct wifi_scan_info const *const wifi,
 	int encoded_cnt = 0;
 	cJSON *wifi_obj = NULL;
 	cJSON *ap_array = NULL;
+	const bool add_all = IS_ENABLED(CONFIG_NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_ALL);
+	const bool add_rssi = (add_all ||
+			       IS_ENABLED(CONFIG_NRF_CLOUD_WIFI_LOCATION_ENCODE_OPT_MAC_RSSI));
 
 	LOG_DBG("Encoding wifi_scan_info with count: %u", wifi->cnt);
 
@@ -2705,28 +2708,29 @@ int nrf_cloud_wifi_req_json_encode(struct wifi_scan_info const *const wifi,
 		}
 
 		/* Optional parameters for the API call */
-		memset(str_buf, 0, sizeof(str_buf));
-		if ((ap->ssid_length > 0) && (ap->ssid_length <= WIFI_SSID_MAX_LEN)) {
-			memcpy(str_buf, ap->ssid, ap->ssid_length);
-		}
-
-		if ((str_buf[0] != '\0') &&
-		    json_add_str_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_SSID, str_buf)) {
+		if (add_rssi && (ap->rssi != NRF_CLOUD_LOCATION_WIFI_OMIT_RSSI) &&
+		    json_add_num_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_RSSI, ap->rssi)) {
 			goto cleanup;
 		}
 
-		if ((ap->rssi != NRF_CLOUD_LOCATION_WIFI_OMIT_RSSI) &&
-		    json_add_num_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_RSSI,
-					ap->rssi)) {
-			goto cleanup;
-		}
+		if (add_all) {
+			memset(str_buf, 0, sizeof(str_buf));
+			if ((ap->ssid_length > 0) && (ap->ssid_length <= WIFI_SSID_MAX_LEN)) {
+				memcpy(str_buf, ap->ssid, ap->ssid_length);
+			}
 
-		if ((ap->channel != NRF_CLOUD_LOCATION_WIFI_OMIT_CHAN) &&
-		    json_add_num_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_CH,
-					ap->channel)) {
-			goto cleanup;
-		}
+			if ((str_buf[0] != '\0') &&
+			    json_add_str_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_SSID,
+					    str_buf)) {
+				goto cleanup;
+			}
 
+			if ((ap->channel != NRF_CLOUD_LOCATION_WIFI_OMIT_CHAN) &&
+			    json_add_num_cs(ap_obj, NRF_CLOUD_LOCATION_JSON_KEY_WIFI_CH,
+					    ap->channel)) {
+				goto cleanup;
+			}
+		}
 		++encoded_cnt;
 	}