samples: mss: Thingy91x fixes

Fix various minor issues with Thingy91x that seem to have originated from the recent upmerge. Fixes IRIS-9781 Signed-off-by: Georges Oates_Larsen <[email protected]>
nrfconnect · Oct 10, 2024 · 6d5f856 · 6d5f856
1 parent 4229268
commit 6d5f856
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/samples/cellular/nrf_cloud_multi_service/Kconfig.sysbuild b/samples/cellular/nrf_cloud_multi_service/Kconfig.sysbuild
@@ -7,4 +7,8 @@
 config WIFI_NRF70
 	default y if BOARD_THINGY91X_NRF9151_NS
 
+choice WIFI_NRF70_OPER_MODES
+	default WIFI_NRF70_SCAN_ONLY if BOARD_THINGY91X_NRF9151_NS
+endchoice
+
 source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
diff --git a/samples/cellular/nrf_cloud_multi_service/README.rst b/samples/cellular/nrf_cloud_multi_service/README.rst
@@ -797,14 +797,21 @@ The device is identified using its UUID rather than its IMEI, since both overlay
 Building with nRF7002 Wi-Fi scanning support
 ============================================
 
-To build the sample with Wi-Fi scanning support for the nRF7002 EK shield attached to an nRF91xx DK, use the ``-DSHIELD=nrf7002ek``, ``-DSB_CONF_FILE=sysbuild_nrf700x-wifi-scan.conf``, and ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only`` options.
+To build the sample with Wi-Fi scanning support for the nRF7002 EK shield attached to an nRF91xx DK, use the ``-DSHIELD=nrf7002ek_nrf7000``, ``-DSB_CONF_FILE=sysbuild_nrf700x-wifi-scan.conf``, and ``-DEXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only`` options.
 
 This enables the Wi-Fi location tracking method automatically.
 
 .. parsed-literal::
    :class: highlight
 
-   west build -p -b *board_target* -- -DSHIELD=nrf7002ek -DSB_CONF_FILE="sysbuild_nrf700x-wifi-scan.conf" -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
+   west build -p -b *board_target* -- -DSHIELD=nrf7002ek_nrf7000 -DSB_CONF_FILE="sysbuild_nrf700x-wifi-scan.conf" -DEXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf"
+
+.. note::
+
+   The ``nrf7002ek_nrf7000`` shield is used here, rather than the ``nrf7002ek`` shield, to put the nRF7002 EK into nRF7000 emulation mode.
+   This is required in order to use scan-only mode.
+
+   To build the sample with Wi-Fi connectivity instead, see :ref:`nrf_cloud_multi_service_building_lte`.
 
 |board_target|
 

diff --git a/samples/cellular/nrf_cloud_multi_service/boards/thingy91x_nrf9151_ns.overlay b/samples/cellular/nrf_cloud_multi_service/boards/thingy91x_nrf9151_ns.overlay
@@ -20,3 +20,8 @@
 &bme680 {
 	status = "okay";
 };
+
+/* Switch to nrf7000 emulation so that scan-only mode is used. */
+&nrf70 {
+	compatible = "nordic,nrf7000-spi";
+};
diff --git a/samples/cellular/nrf_cloud_multi_service/sample.yaml b/samples/cellular/nrf_cloud_multi_service/sample.yaml
@@ -94,7 +94,7 @@ tests:
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp/ns
     platform_allow: nrf5340dk/nrf5340/cpuapp/ns
-    extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek_nrf7000
+    extra_args: nrf_cloud_multi_service_SHIELD=nrf7002ek
       EXTRA_CONF_FILE="overlay_nrf700x_wifi_mqtt_no_lte.conf"
       SB_CONF_FILE="sysbuild_nrf700x-wifi-conn.conf"
     tags: ci_build sysbuild ci_samples_cellular