samples: matter: add support for nRF21540

.checkpatch.conf

@@ -22,6 +22,7 @@
 --ignore MULTISTATEMENT_MACRO_USE_DO_WHILE
 --exclude ext
 --exclude samples/matter/.*/src
+--exclude applications/matter_weather_station/src
 --exclude samples/openthread/cli/harness
 --exclude modules/tfm/tfm/boards/src
 --exclude modules/tfm/tfm/boards/common

.github/labeler.yml

@@ -46,7 +46,6 @@
   - "tests/subsys/net/**/*"
 
 "CI-all-test":
-  - "west.yml"
   - "**/*partition_manager*/**/*"
   - "**/*partition_manager*"
 
@@ -181,19 +180,24 @@
   - "samples/matter/**/*"
 
 "CI-find-my-test":
-  - "include/bluetooth/**/*"
-  - "include/dfu/**/*"
-  - "include/nfc/**/*"
-  - "include/dk_buttons_and_leds.h"
-  - "include/event_manager.h"
-  - "lib/dk_buttons_and_leds/**/*"
-  - "subsys/bootloader/**/*"
-  - "subsys/bluetooth/**/*"
-  - "subsys/dfu/dfu_target/**/*"
-  - "subsys/event_manager/**/*"
-  - "subsys/nfc/**/*"
-  - "subsys/partition_manager/**/*"
-  - "modules/mcuboot/**/*"
+  - any:
+    - "include/dfu/**/*"
+    - "include/nfc/**/*"
+    - "include/dk_buttons_and_leds.h"
+    - "include/event_manager.h"
+    - "lib/dk_buttons_and_leds/**/*"
+    - "subsys/bootloader/**/*"
+    - "subsys/dfu/dfu_target/**/*"
+    - "subsys/event_manager/**/*"
+    - "subsys/nfc/**/*"
+    - "subsys/partition_manager/**/*"
+    - "modules/mcuboot/**/*"
+  - any:
+    - "include/bluetooth/**/*"
+    - "!include/bluetooth/mesh/**/*"
+  - any:
+    - "subsys/bluetooth/**/*"
+    - "!subsys/bluetooth/mesh/**/*"
 
-"no-changelog":
-  - "!doc/nrf/releases/release-notes-latest.rst"
+"changelog-entry-required":
+  - "!doc/nrf/releases/release-notes-changelog.rst"

.github/workflows/contribs.yml

@@ -15,9 +15,14 @@ jobs:
           command: 'external'
           messages: |
                     Thank you for your contribution!
-                    It seems you are not a member of the nrfconnect GitHub organization.
-                    At this time we are not accepting external contributions, but this may change soon.
-                    Please visit https://devzone.nordicsemi.com/ to raise any issues you found or ask for help.
+                    It seems you are not a member of the nrfconnect GitHub organization. External contributions are handled as follows:
+                    Large contributions, affecting multiple subsystems for example, may be rejected if they are complex, may introduce regressions due to lack of test coverage, or if they are not consistent with the architecture of nRF Connect SDK.
+                    PRs will be run in our continuous integration (CI) test system.
+                    If CI passes, PRs will be tagged for review and merged on successful completion of review. You may be asked to make some modifications to your contribution during review.
+                    If CI fails, PRs may be rejected or may be tagged for review and rework.
+                    PRs that become outdated due to other changes in the repository may be rejected or rework requested.
+                    External contributions will be prioritized for review based on the relevance to current development efforts in nRF Connect SDK.  Bug fix PRs will be prioritized.
+                    You may raise issues or ask for help from our Technical Support team by visiting https://devzone.nordicsemi.com/.
                     |
                     The author of this pull request has now been added to the nrfconnect GitHub organization.
           labels: 'external'

.github/workflows/manifest.yml

@@ -22,12 +22,26 @@ jobs:
           fetch-depth: 0
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.1.0
+        uses: oyvindronningstad/action-manifest@module-labels
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           manifest-path: 'west.yml'
           checkout-path: 'ncs/nrf'
           label-prefix: 'manifest-'
           verbosity-level: '1'
-          labels: 'manifest'
+
+          # Add one label per line. 'manifest' always adds the label 'manifest'.
+          # 'CI-all-test:zephyr;nrfxlib,' adds the 'CI-all-test' label when the
+          # zephyr module or the nrfxlib module is changed. Each line is comma-
+          # separated.
+          labels: >
+            manifest,
+            CI-all-test:zephyr;nrfxlib,
+            CI-tfm-test:trusted-firmware-m;tfm-mcuboot,
+            CI-boot-dfu-test:mcuboot;mcumgr,
+            CI-matter-test:matter,
+            CI-find-my-test:find-my,
+            CI-homekit-test:homekit,
+            CI-thread-test:openthread,
+            CI-crypto-test:mbedtls;mbedtls-nrf
           dnm-labels: 'DNM'

.github/workflows/oss-history.yml

@@ -21,7 +21,7 @@ jobs:
         run: |
           west init -l ncs/nrf
           cd ncs
-          west update zephyr
+          west update zephyr mcuboot trusted-firmware-m
           git -C zephyr remote add upstream https://github.com/zephyrproject-rtos/zephyr
 
       - name: Check OSS history

CODEOWNERS

@@ -21,6 +21,7 @@
 /applications/asset_tracker_v2/           @simensrostad @jtguggedal @jhn-nordic @coderbyheart
 /applications/connectivity_bridge/        @jtguggedal @nordic-auko
 /applications/machine_learning/           @pdunaj
+/applications/matter_weather_station/     @Damian-Nordic @kkasperczyk-no
 /applications/nrf_desktop/                @pdunaj
 /applications/pelion_client/              @pdunaj
 /applications/serial_lte_modem/           @junqingzou @lats1980 @rlubos
@@ -115,12 +116,13 @@ Kconfig*                                  @tejlmand
 /samples/profiler/                        @pdunaj @pizi-nordic
 /samples/peripheral/radio_test/           @kapi-no
 /samples/peripheral/lpuart/               @nordic-krch
+/samples/peripheral/802154_phy_test/      @czeslawmakarski
 /samples/tfm/tfm_hello_world/             @oyvindronningstad
 /samples/zigbee/                          @tomchy @sebastiandraus
 /samples/CMakeLists.txt                   @tejlmand
 /samples/nrf5340/netboot/                 @hakonfam
 /samples/nrf5340/multiprotocol_rpmsg/     @hubertmis
-/scripts/                                 @mbolivar @tejlmand
+/scripts/                                 @mbolivar-nordic @tejlmand
 /scripts/hid_configurator/                @pdunaj
 /scripts/tools-versions-*.txt             @tejlmand @asle-nordic @grho @shanta-14
 /share/zephyrbuild-package/               @tejlmand

Kconfig.nrf

@@ -24,8 +24,8 @@ config MBEDTLS_LIBRARY_NRF_SECURITY
 endchoice
 
 # This is a temporary solution to whitelist
-# BOARD_THINGY91_NRF9160NS in compliance
-config BOARD_THINGY91_NRF9160NS
+# BOARD_THINGY91_NRF9160_NS in compliance
+config BOARD_THINGY91_NRF9160_NS
 	bool
 
 # nRF Connect SDK needs a larger default stacks in certain configurations

applications/asset_tracker/Kconfig

@@ -207,10 +207,10 @@ config ACCEL_TRIGGER
 
 config FLIP_INPUT
 	int "Button or switch number to simulate flip"
-	range 1 4 if BOARD_NRF9160DK_NRF9160NS
-	range 1 1 if BOARD_THINGY91_NRF9160NS
-	default 3 if BOARD_NRF9160DK_NRF9160NS
-	default 1 if BOARD_THINGY91_NRF9160NS
+	range 1 4 if BOARD_NRF9160DK_NRF9160_NS
+	range 1 1 if BOARD_THINGY91_NRF9160_NS
+	default 3 if BOARD_NRF9160DK_NRF9160_NS
+	default 1 if BOARD_THINGY91_NRF9160_NS
 	help
 	  Button or switch number to use for simulating
 	  a board flip event.
@@ -232,7 +232,7 @@ endif
 
 config ACCEL_INVERTED
 	bool "Accelerometer inverted"
-	default y if BOARD_THINGY91_NRF9160NS
+	default y if BOARD_THINGY91_NRF9160_NS
 	help
 	  Enable if the accelerometer is mounted with the top side facing
 	  down when the board itself is in normal position.
@@ -258,8 +258,8 @@ config CLOUD_BUTTON
 
 config CLOUD_BUTTON_INPUT
 	int "Set button sensor button number"
-	range 1 4 if BOARD_NRF9160DK_NRF9160NS
-	range 1 1 if BOARD_THINGY91_NRF9160NS
+	range 1 4 if BOARD_NRF9160DK_NRF9160_NS
+	range 1 1 if BOARD_THINGY91_NRF9160_NS
 	default 1
 
 config CLOUD_CONNECT_RETRY_DELAY
@@ -388,10 +388,10 @@ config TEMP_TRIGGER
 
 config TEMP_SIM_BUTTON
 	int "Button or switch to trigger 'data ready' event"
-	range 1 4 if BOARD_NRF9160DK_NRF9160NS
-	range 1 1 if BOARD_THINGY91_NRF9160NS
-	default 3 if BOARD_NRF9160DK_NRF9160NS
-	default 1 if BOARD_THINGY91_NRF9160NS
+	range 1 4 if BOARD_NRF9160DK_NRF9160_NS
+	range 1 1 if BOARD_THINGY91_NRF9160_NS
+	default 3 if BOARD_NRF9160DK_NRF9160_NS
+	default 1 if BOARD_THINGY91_NRF9160_NS
 	help
 	  Button or switch number to use for triggering
 	  a 'data ready' event.
@@ -415,14 +415,14 @@ endif # ENVIRONMENT_SENSORS
 
 menuconfig LIGHT_SENSOR
 	bool "Light sensor"
-	select BH1749 if BOARD_THINGY91_NRF9160NS
-	default y if BOARD_THINGY91_NRF9160NS
+	select BH1749 if BOARD_THINGY91_NRF9160_NS
+	default y if BOARD_THINGY91_NRF9160_NS
 
 if LIGHT_SENSOR
 
 config LIGHT_SENSOR_DEV_NAME
 	string "Light sensor device name"
-	default "BH1749" if BOARD_THINGY91_NRF9160NS
+	default "BH1749" if BOARD_THINGY91_NRF9160_NS
 
 config LIGHT_SENSOR_DATA_SEND_INTERVAL
 	int "Interval in seconds for sending light sensor data"

applications/asset_tracker/README.rst

@@ -101,7 +101,7 @@ The sample supports the following development kits:
 
 .. table-from-rows:: /includes/sample_board_rows.txt
    :header: heading
-   :rows: thingy91_nrf9160ns, nrf9160dk_nrf9160ns
+   :rows: thingy91_nrf9160_ns, nrf9160dk_nrf9160_ns
 
 .. include:: /includes/spm.txt
 
@@ -216,7 +216,7 @@ Alternatively, use the command line tool ``menuconfig`` or configure the options
 .. external_antenna_note_start
 
 .. note::
-   For nRF9160 DK v0.15.0 and later, set the :option:`CONFIG_NRF9160_GPS_ANTENNA_EXTERNAL` option to ``y`` when building the application to achieve the best external antenna performance.
+   For nRF9160 DK v0.15.0 and later, set the :kconfig:`CONFIG_NRF9160_GPS_ANTENNA_EXTERNAL` option to ``y`` when building the application to achieve the best external antenna performance.
 
 .. external_antenna_note_end
 
@@ -289,7 +289,7 @@ This application uses the following |NCS| libraries and drivers:
 * :ref:`lte_lc_readme`
 * |NCS| modules abstracted via the LwM2M carrier OS abstraction layer (:file:`lwm2m_os.h`)
 
-.. include:: /lib/bin/lwm2m_carrier/doc/app_integration.rst
+.. include:: /libraries/bin/lwm2m_carrier/app_integration.rst
   :start-after: lwm2m_osal_mod_list_start
   :end-before: lwm2m_osal_mod_list_end
 

applications/asset_tracker/sample.yaml

@@ -3,5 +3,5 @@ sample:
 tests:
   applications.asset_tracker:
     build_only: true
-    platform_allow: nrf9160dk_nrf9160ns thingy91_nrf9160ns qemu_x86
+    platform_allow: nrf9160dk_nrf9160_ns thingy91_nrf9160_ns qemu_x86
     tags: ci_build

applications/asset_tracker/src/main.c

@@ -21,6 +21,9 @@
 #endif /* CONFIG_NRF_MODEM_LIB */
 #include <net/cloud.h>
 #include <net/socket.h>
+#if defined(CONFIG_AGPS)
+#include <modem/agps.h>
+#endif
 #include <net/nrf_cloud.h>
 #if defined(CONFIG_NRF_CLOUD_AGPS)
 #include <net/nrf_cloud_agps.h>
@@ -479,6 +482,36 @@ static void send_cell_pos_request(struct k_work *work)
 }
 #endif /* CONFIG_NRF_CLOUD_CELL_POS */
 
+#if defined(CONFIG_AGPS)
+/* Converts the A-GPS data request from GPS driver to GNSS API format. */
+static void agps_request_convert(
+	struct nrf_modem_gnss_agps_data_frame *dest,
+	const struct gps_agps_request *src)
+{
+	dest->sv_mask_ephe = src->sv_mask_ephe;
+	dest->sv_mask_alm = src->sv_mask_alm;
+	dest->data_flags = 0;
+	if (src->utc) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_GPS_UTC_REQUEST;
+	}
+	if (src->klobuchar) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_KLOBUCHAR_REQUEST;
+	}
+	if (src->nequick) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_NEQUICK_REQUEST;
+	}
+	if (src->system_time_tow) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_SYS_TIME_AND_SV_TOW_REQUEST;
+	}
+	if (src->position) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_POSITION_REQUEST;
+	}
+	if (src->integrity) {
+		dest->data_flags |= NRF_MODEM_GNSS_AGPS_INTEGRITY_REQUEST;
+	}
+}
+#endif
+
 static void send_agps_request(struct k_work *work)
 {
 	ARG_UNUSED(work);
@@ -494,8 +527,12 @@ static void send_agps_request(struct k_work *work)
 	    (k_uptime_get() - last_request_timestamp) < AGPS_UPDATE_PERIOD) {
 		LOG_WRN("A-GPS request was sent less than 1 hour ago");
 	} else {
+		struct nrf_modem_gnss_agps_data_frame request;
+
+		agps_request_convert(&request, &agps_request);
+
 		LOG_INF("Sending A-GPS request");
-		err = gps_agps_request_send(agps_request, GPS_SOCKET_NOT_PROVIDED);
+		err = agps_request_send(request, AGPS_SOCKET_NOT_PROVIDED);
 		if (err) {
 			LOG_ERR("Failed to request A-GPS data, error: %d", err);
 		} else {
@@ -1569,8 +1606,7 @@ void cloud_event_handler(const struct cloud_backend *const backend,
 		}
 
 #if defined(CONFIG_AGPS)
-		err = gps_process_agps_data(evt->data.msg.buf,
-					    evt->data.msg.len);
+		err = agps_cloud_data_process(evt->data.msg.buf, evt->data.msg.len);
 #if defined(CONFIG_NRF_CLOUD_PGPS)
 		if (!err) {
 			LOG_INF("A-GPS data processed");