Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
fix: update from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jun 20, 2023
1 parent 6a57dfc commit 7af2158
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 8 deletions.
4 changes: 2 additions & 2 deletions doc/location_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ To enable Wi-Fi positioning and especially nRF7002 functionality, use a
special DTC overlay with the compiler option ``-DDTC_OVERLAY_FILE=nrf9160dk_with_nrf7002ek.overlay`` and a
configuration overlay ``-DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf``.

To build for the nRF9160 DK with nRF7002 EK, use the ``nrf9160dk_nrf9160_ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek_nrf7002`` and a scan-only overlay configuration.
To build for the nRF9160 DK with nRF7002 EK, use the ``nrf9160dk_nrf9160_ns`` build target with the ``SHIELD`` CMake option set to ``nrf7002ek`` and a scan-only overlay configuration.
The following is an example of the CLI command:

.. code-block:: console
west build -p -b nrf9160dk_nrf9160ns -- -DSHIELD=nrf7002ek_nrf7002 -DDTC_OVERLAY_FILE=nrf9160dk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
west build -p -b nrf9160dk_nrf9160_ns -- -DSHIELD=nrf7002ek -DDTC_OVERLAY_FILE=nrf9160dk_with_nrf7002ek.overlay -DOVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
Wi-Fi positioning has the following limitations:

Expand Down
1 change: 1 addition & 0 deletions nrf9160dk_with_ext_flash.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
mx25r64: mx25r6435f@1 {
compatible = "jedec,spi-nor";
reg = <1>;
status = "okay";
spi-max-frequency = <8000000>;
jedec-id = [c2 28 17];
sfdp-bfp = [
Expand Down
49 changes: 49 additions & 0 deletions nrf9161dk_with_ext_flash.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Copyright (c) 2023 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

&spi3 {
compatible = "nordic,nrf-spim";
status = "okay";
cs-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>, /* D10 */
<&gpio0 20 GPIO_ACTIVE_LOW>;


gd25lb256: gd25lb256e3ir@1 {
compatible = "jedec,spi-nor";
status = "disabled";
reg = <1>;
spi-max-frequency = <60000000>;
jedec-id = [c8 67 19];
sfdp-bfp = [
e5 20 ea ff ff ff ff 0f 44 eb 08 6b 00 3b 00 bb
fe ff ff ff ff ff 00 ff ff ff 44 eb 0c 20 0f 52
10 d8 00 ff d5 31 b1 fe 82 e4 14 4c ec 60 06 33
7a 75 7a 75 04 bd d5 5c 29 06 74 00 08 50 00 01
];
size = <268435456>;
has-dpd;
t-enter-dpd = <3000>;
t-exit-dpd = <30000>;
};
};

/* Enable high drive mode for the SPI3 pins to get a square signal at 8 MHz */
&spi3_default {
group1 {
nordic,drive-mode = <NRF_DRIVE_H0H1>;
};
};

/ {
aliases {
ext-flash = &gd25lb256;
};

/* Configure partition manager to use gd25lb256 as the external flash */
chosen {
nordic,pm-ext-flash = &gd25lb256;
};
};
19 changes: 19 additions & 0 deletions nrf91xxdk_with_nrf7002ek.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* Copyright (c) 2022 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/* Use high drive mode on SPI pins that handle communication with nRF7002
* so that SCK frequency > 4 MHz can be used. */
&spi3_default {
group1 {
nordic,drive-mode = <NRF_DRIVE_H0H1>;
};
};

/* Disabled because of conflicts on P0.00 and P0.01 - Arduino pins D0 and D1
* (iovdd-ctrl-gpios and bucken-gpios in nrf7002ek, respectively). */
&uart1 {
status = "disabled";
};
2 changes: 1 addition & 1 deletion overlay-nrf7002ek-wifi-scan-only.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Overlay to use nRF7002 EK on top of nrf9160 DK for Wi-Fi scanning
# Overlay to use nRF7002 EK on top of nrf91 DK for Wi-Fi scanning

# Disable modem traces as UART1 is disabled
CONFIG_NRF_MODEM_LIB_TRACE=n
Expand Down
4 changes: 4 additions & 0 deletions pm_static_nrf9161dk_nrf9161_ns.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
mcuboot_secondary:
region: external_flash
address: 0x0
size: 0xD0000
30 changes: 25 additions & 5 deletions sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ tests:
- thingy91_nrf9160_ns
extra_args: OVERLAY_CONFIG=overlay-low-power.conf
tags: ci_build
applications.asset_tracker_v2.carrier:
applications.asset_tracker_v2.carrier.nrf9160dk:
build_only: true
build_on_all: true
platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns
Expand All @@ -127,6 +127,15 @@ tests:
- thingy91_nrf9160_ns
extra_args: OVERLAY_CONFIG=overlay-carrier.conf
tags: ci_build
applications.asset_tracker_v2.carrier.nrf9161dk:
build_only: true
build_on_all: true
platform_allow: nrf9161dk_nrf9161_ns
integration_platforms:
- nrf9161dk_nrf9161_ns
extra_args: OVERLAY_CONFIG=overlay-carrier.conf
DTC_OVERLAY_FILE=nrf9161dk_with_ext_flash.overlay
tags: ci_build
applications.asset_tracker_v2.lwm2m.low-power:
build_only: true
build_on_all: true
Expand Down Expand Up @@ -162,6 +171,7 @@ tests:
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns
integration_platforms:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
- thingy91_nrf9160_ns
extra_configs:
- CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
Expand All @@ -173,25 +183,35 @@ tests:
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns
integration_platforms:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
- thingy91_nrf9160_ns
extra_configs:
- CONFIG_MEMFAULT_NCS_PROJECT_KEY="PROJECTKEY"
extra_args: OVERLAY_CONFIG="overlay-low-power.conf;overlay-memfault.conf"
tags: ci_build
applications.asset_tracker_v2.nrf7002ek_wifi:
applications.asset_tracker_v2.nrf7002ek_wifi.nrf9160dk:
build_only: true
integration_platforms:
- nrf9160dk_nrf9160_ns
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
platform_allow: nrf9160dk_nrf9160_ns
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
tags: ci_build
applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
build_only: true
integration_platforms:
- nrf9161dk_nrf9161_ns
platform_allow: ns nrf9161dk_nrf9161_ns
extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf7002ek-wifi-scan-only.conf
DTC_OVERLAY_FILE="nrf9160dk_with_nrf7002ek.overlay"
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay;nrf9161dk_with_ext_flash.overlay"
tags: ci_build
applications.asset_tracker_v2.nrf7002ek_wifi-debug:
build_only: true
integration_platforms:
- nrf9160dk_nrf9160_ns
- nrf9161dk_nrf9161_ns
platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
extra_args: SHIELD=nrf7002ek
OVERLAY_CONFIG="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
DTC_OVERLAY_FILE="nrf9160dk_with_nrf7002ek.overlay"
DTC_OVERLAY_FILE="nrf91xxdk_with_nrf7002ek.overlay"
tags: ci_build

0 comments on commit 7af2158

Please sign in to comment.