Merge branch 'main' into remove_sidewalk

Author: totyz

.github/test-spec.yml

@@ -1,5 +1,9 @@
 # This is the Jenkins ci variant of the .github/labler.yaml
 
+"__EXCLUDE__":
+  - "**/VERSION"
+  - "**/*.rst"
+
 "CI-run-twister":
   - any:
       - "!.github/**/*"
@@ -8,7 +12,6 @@
       - "!test-manifests/**/*"
       - "!CODEOWNERS"
       - "!LICENSE"
-      - "!**/*.rst"
       - "!VERSION"
       - "!ncs_version.h.in"
 
@@ -608,6 +611,7 @@
   - "include/drivers/gpio/**/*"
   - "include/event_manager_proxy.h"
   - "subsys/event_manager_proxy/**/*"
+  - "samples/zephyr/drivers/adc/**/*"
   - "samples/zephyr/drivers/audio/**/*"
   - "samples/zephyr/drivers/i2c/**/*"
   - "samples/zephyr/drivers/watchdog/**/*"
@@ -628,6 +632,7 @@
   - "tests/drivers/spi/**/*"
   - "tests/drivers/uart/**/*"
   - "tests/subsys/event_manager_proxy/**/*"
+  - "tests/zephyr/drivers/adc/**/*"
   - "tests/zephyr/drivers/comparator/**/*"
   - "tests/zephyr/drivers/gpio/**/*"
   - "tests/zephyr/drivers/flash/**/*"

.github/workflows/manifest.yml

@@ -31,7 +31,7 @@ jobs:
           west update zephyr
 
       - name: Manifest
-        uses: zephyrproject-rtos/action-manifest@v1.7.0
+        uses: zephyrproject-rtos/action-manifest@v1.8.0
         with:
           github-token: ${{ secrets.NCS_GITHUB_TOKEN }}
           manifest-path: 'west.yml'
@@ -43,3 +43,4 @@ jobs:
           verbosity-level: '1'
           labels: 'manifest'
           dnm-labels: 'DNM'
+          allowed-unreachables: 'dragoon'

CODEOWNERS

@@ -47,9 +47,9 @@
 /applications/matter_weather_station/*.rst @nrfconnect/ncs-matter-doc
 /applications/nrf5340_audio/**/*.rst      @nrfconnect/ncs-audio-doc
 /applications/nrf_desktop/**/*.rst        @nrfconnect/ncs-si-bluebagel-doc
+/applications/sdp/**/*.rst                @annwoj
 /applications/serial_lte_modem/**/*.rst   @nrfconnect/ncs-iot-oulu-tampere-doc
 /applications/serial_lte_modem/doc/CARRIER_AT_commands.rst @nrfconnect/ncs-carrier-doc
-/applications/zigbee_weather_station/*.rst @nrfconnect/ncs-terahertz-doc
 
 # Boards
 /boards/nordic/nrf7120pdk/                @nrfconnect/ncs-co-boards @rob-robinson-14 @Hi-Im-David
@@ -191,6 +191,7 @@
 /doc/nrf/libraries/others/adp536x.rst     @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/others/app_event_manager.rst @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/others/app_event_manager_profiler_tracer.rst @nrfconnect/ncs-si-bluebagel-doc
+/doc/nrf/libraries/others/app_jwt.rst      @nrfconnect/ncs-modem-doc @ayla-nordicsemi
 /doc/nrf/libraries/others/audio_module.rst @nrfconnect/ncs-audio-doc
 /doc/nrf/libraries/others/contin_array.rst @nrfconnect/ncs-audio-doc
 /doc/nrf/libraries/others/data_fifo.rst   @nrfconnect/ncs-audio-doc
@@ -228,7 +229,6 @@
 /doc/nrf/libraries/security/index.rst     @nrfconnect/ncs-aegir-doc
 /doc/nrf/libraries/security/trusted_storage.rst @nrfconnect/ncs-aegir-doc
 /doc/nrf/libraries/shell/                 @nrfconnect/ncs-doc-leads
-/doc/nrf/libraries/zigbee/                @nrfconnect/ncs-terahertz-doc
 /doc/nrf/libraries/index.rst              @nrfconnect/ncs-doc-leads
 /doc/nrf/protocols/amazon_sidewalk/       @nrfconnect/ncs-sidewalk-doc
 /doc/nrf/protocols/bt/                    @nrfconnect/ncs-dragoon-doc
@@ -308,11 +308,12 @@
 /dts/                                     @nrfconnect/ncs-co-drivers
 
 # External
-/ext/curl/                                @nrfconnect/ncs-code-owners @jhirsi
+/ext/curl/                                @nrfconnect/ncs-code-owners @nrfconnect/ncs-modem-tre
 /ext/freebsd-getopt/                      @nrfconnect/ncs-code-owners
-/ext/iperf3/                              @nrfconnect/ncs-code-owners @jhirsi
+/ext/iperf3/                              @nrfconnect/ncs-code-owners @nrfconnect/ncs-modem-tre
 
 # Include
+/include/app_jwt.h                        @nrfconnect/ncs-modem @ayla-nordicsemi
 /include/audio/                           @nrfconnect/ncs-audio
 /include/audio_module/                    @nrfconnect/ncs-audio
 /include/bluetooth/                       @nrfconnect/ncs-dragoon
@@ -354,7 +355,7 @@
 /include/fem_al/                          @nrfconnect/ncs-dragoon
 /include/logging/                         @nrfconnect/ncs-protocols-serialization
 /include/mgmt/                            @nrfconnect/ncs-pluto
-/include/modem/                           @nrfconnect/ncs-modem
+/include/modem/                           @nrfconnect/ncs-modem @nrfconnect/ncs-modem-tre
 /include/mpsl/                            @nrfconnect/ncs-dragoon
 /include/net/                             @nrfconnect/ncs-co-networking
 /include/net/azure_*                      @nrfconnect/ncs-cia
@@ -376,18 +377,19 @@
 
 # Libraries
 /lib/adp536x/                             @nrfconnect/ncs-cia
+/lib/app_jwt/                             @nrfconnect/ncs-modem @ayla-nordicsemi
 /lib/at_cmd_parser/                       @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
 /lib/at_cmd_custom/                       @nrfconnect/ncs-modem
 /lib/at_host/                             @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
-/lib/at_monitor/                          @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
+/lib/at_monitor/                          @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem @nrfconnect/ncs-modem-tre
 /lib/at_parser/                           @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
 /lib/at_shell/                            @nrfconnect/ncs-cia
 /lib/bin/                                 @nrfconnect/ncs-co-networking @lemrey
 /lib/bin/lwm2m_carrier/                   @nrfconnect/ncs-carrier
 /lib/boot_banner/                         @nordicjm
 /lib/contin_array/                        @nrfconnect/ncs-audio
 /lib/data_fifo/                           @nrfconnect/ncs-audio
-/lib/date_time/                           @trantanen @tokangas
+/lib/date_time/                           @nrfconnect/ncs-modem-tre
 /lib/dk_buttons_and_leds/                 @nrfconnect/ncs-si-muffin
 /lib/edge_impulse/                        @nrfconnect/ncs-si-muffin
 /lib/fatal_error/                         @nordic-krch
@@ -398,27 +400,27 @@
 /lib/hw_id/                               @nrfconnect/ncs-cia
 /lib/hw_unique_key/                       @nrfconnect/ncs-aegir
 /lib/identity_key/                        @nrfconnect/ncs-aegir
-/lib/location/                            @trantanen @jhirsi @tokangas
-/lib/lte_link_control/                    @tokangas @trantanen @jhirsi @nrfconnect/ncs-modem
-/lib/modem_antenna/                       @tokangas @nrfconnect/ncs-modem
+/lib/location/                            @nrfconnect/ncs-modem-tre
+/lib/lte_link_control/                    @nrfconnect/ncs-modem-tre @nrfconnect/ncs-modem
+/lib/modem_antenna/                       @nrfconnect/ncs-modem-tre @nrfconnect/ncs-modem
 /lib/modem_attest_token/                  @nrfconnect/ncs-modem
 /lib/modem_battery/                       @nrfconnect/ncs-modem
-/lib/modem_info/                          @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
+/lib/modem_info/                          @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem @nrfconnect/ncs-modem-tre
 /lib/modem_jwt/                           @nrfconnect/ncs-iot-oulu @nrfconnect/ncs-modem
 /lib/modem_key_mgmt/                      @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
 /lib/modem_slm/                           @nrfconnect/ncs-iot-oulu
 /lib/multithreading_lock/                 @nrfconnect/ncs-dragoon
-/lib/nrf_modem_lib/                       @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
+/lib/nrf_modem_lib/                       @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem @nrfconnect/ncs-modem-tre
 /lib/pcm_mix/                             @nrfconnect/ncs-audio
 /lib/pcm_stream_channel_modifier/         @nrfconnect/ncs-audio
-/lib/pdn/                                 @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
+/lib/pdn/                                 @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem @nrfconnect/ncs-modem-tre
 /lib/qos/                                 @nrfconnect/ncs-cia
 /lib/ram_pwrdn/                           @MarekPorwisz
 /lib/sample_rate_converter/               @nrfconnect/ncs-audio
 /lib/sfloat/                              @nrfconnect/ncs-si-muffin
-/lib/sms/                                 @trantanen @tokangas
+/lib/sms/                                 @nrfconnect/ncs-modem-tre
 /lib/st25r3911b/                          @nrfconnect/ncs-si-muffin
-/lib/supl/                                @nrfconnect/ncs-co-networking @tokangas
+/lib/supl/                                @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem-tre
 /lib/tone/                                @nrfconnect/ncs-audio
 /lib/uicc_lwm2m/                          @stig-bjorlykke
 /lib/wave_gen/                            @nrfconnect/ncs-si-bluebagel
@@ -438,6 +440,7 @@
 /samples/CMakeLists.txt                   @nrfconnect/ncs-co-build-system
 /samples/app_event_manager/               @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/app_event_manager_profiler_tracer/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
+/samples/app_jwt/                             @nrfconnect/ncs-modem @ayla-nordicsemi
 /samples/benchmarks/coremark/             @nrfconnect/ncs-si-bluebagel
 /samples/bluetooth/nrf_auraconfig/        @nrfconnect/ncs-audio
 /samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin
@@ -494,23 +497,23 @@
 /samples/caf_sensor_manager/              @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/cellular/                        @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
 /samples/cellular/battery/                @nrfconnect/ncs-modem
-/samples/cellular/gnss/                   @tokangas
-/samples/cellular/location/               @trantanen @jhirsi @tokangas
+/samples/cellular/gnss/                   @nrfconnect/ncs-modem-tre
+/samples/cellular/location/               @nrfconnect/ncs-modem-tre
 /samples/cellular/lwm2m_carrier/          @nrfconnect/ncs-carrier
 /samples/cellular/lwm2m_client/           @nrfconnect/ncs-co-networking @nrfconnect/ncs-iot-oulu
-/samples/cellular/modem_shell/            @trantanen @jhirsi @tokangas
+/samples/cellular/modem_shell/            @nrfconnect/ncs-modem-tre
 /samples/cellular/nidd/                   @stig-bjorlykke
 /samples/cellular/nrf_cloud_*             @nrfconnect/ncs-nrf-cloud
 /samples/cellular/nrf_provisioning/       @nrfconnect/ncs-iot-oulu
 /samples/cellular/modem_trace_flash/      @nrfconnect/ncs-modem
 /samples/cellular/slm_shell/              @nrfconnect/ncs-iot-oulu
-/samples/cellular/sms/                    @trantanen @tokangas
+/samples/cellular/sms/                    @nrfconnect/ncs-modem-tre
 /samples/cellular/uicc_lwm2m/             @stig-bjorlykke
 /samples/common/                          @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/crypto/                          @nrfconnect/ncs-aegir
 /samples/debug/memfault/                  @nrfconnect/ncs-cia
 /samples/debug/ppi_trace/                 @nordic-krch
-/samples/dect/dect_phy/dect_shell/        @jhirsi
+/samples/dect/dect_phy/dect_shell/        @nrfconnect/ncs-modem-tre
 /samples/dect/dect_phy/hello_dect/        @nrfconnect/ncs-modem
 /samples/edge_impulse/                    @nrfconnect/ncs-si-muffin
 /samples/esb/                             @nrfconnect/ncs-si-muffin
@@ -561,6 +564,7 @@
 
 /samples/app_event_manager/*.rst          @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /samples/app_event_manager_profiler_tracer/*.rst @nrfconnect/ncs-si-muffin-doc
+/samples/app_jwt/*.rst                        @nrfconnect/ncs-modem-doc @ayla-nordicsemi
 /samples/benchmarks/coremark/*.rst        @nrfconnect/ncs-si-bluebagel-doc
 /samples/bluetooth/**/*.rst                @nrfconnect/ncs-si-bluebagel-doc @nrfconnect/ncs-si-muffin-doc
 /samples/bluetooth/central_and_peripheral_hr/*.rst @nrfconnect/ncs-si-muffin-doc
@@ -663,9 +667,9 @@
 /samples/tfm/**/*.rst                     @nrfconnect/ncs-aegir-doc
 /samples/wifi/**/*.rst                    @nrfconnect/ncs-wifi-doc
 /samples/wifi/provisioning/softap/*.rst   @nrfconnect/ncs-cia-doc
-/samples/zigbee/**/*.rst                  @nrfconnect/ncs-terahertz-doc
 /samples/zephyr/basic/blinky/             @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /samples/zephyr/boards/nordic/system_off/ @nrfconnect/ncs-low-level-test
+/samples/zephyr/drivers/adc/              @nrfconnect/ncs-low-level-test
 /samples/zephyr/drivers/audio/dmic/       @nrfconnect/ncs-low-level-test
 /samples/zephyr/drivers/i2c/rtio_loopback/ @nrfconnect/ncs-low-level-test
 /samples/zephyr/drivers/watchdog/         @nrfconnect/ncs-low-level-test
@@ -690,10 +694,11 @@
 /scripts/requirements-*.txt               @nrfconnect/ncs-co-build-system @nrfconnect/ncs-ci
 /scripts/west_commands/utils/             @gmarull
 /scripts/west_commands/create_board/      @gmarull
-/scripts/west_commands/sbom/              @nrfconnect/ncs-si-muffin
+/scripts/west_commands/sbom/              @nrfconnect/ncs-co-scripts
 /scripts/west_commands/thingy91x_dfu.py   @nrfconnect/ncs-cia
 /scripts/west_commands/ncs_provision.py   @nrfconnect/ncs-pluto
 /scripts/bootloader/                      @nrfconnect/ncs-pluto
+/scripts/reglock.py                       @nrfconnect/ncs-pluto
 /scripts/ncs-docker-version.txt           @nrfconnect/ncs-ci
 /scripts/print_docker_image.sh            @nrfconnect/ncs-ci
 /scripts/print_toolchain_checksum.sh      @nrfconnect/ncs-ci
@@ -707,7 +712,7 @@
 /scripts/nrf_provision/fast_pair/*.rst    @nrfconnect/ncs-si-bluebagel-doc
 /scripts/partition_manager/*.rst          @nrfconnect/ncs-aurora-doc
 /scripts/shell/ble_console/**/*.rst       @nrfconnect/ncs-doc-leads
-/scripts/west_commands/sbom/*.rst         @nrfconnect/ncs-si-muffin-doc
+/scripts/west_commands/sbom/*.rst         @nrfconnect/ncs-co-doc @nrfconnect/ncs-doc-leads
 
 # Share
 /share/                                   @nrfconnect/ncs-co-build-system
@@ -847,13 +852,13 @@
 /tests/lib/at_parser/                     @nrfconnect/ncs-modem
 /tests/lib/contin_array/                  @nrfconnect/ncs-audio
 /tests/lib/data_fifo/                     @nrfconnect/ncs-audio
-/tests/lib/date_time/                     @trantanen @tokangas
+/tests/lib/date_time/                     @nrfconnect/ncs-modem-tre
 /tests/lib/edge_impulse/                  @nrfconnect/ncs-si-muffin
 /tests/lib/gcf_sms/                       @nrfconnect/ncs-modem
 /tests/lib/hw_unique_key*/                @nrfconnect/ncs-aegir
 /tests/lib/hw_id/                         @nrfconnect/ncs-cia
-/tests/lib/location/                      @trantanen @tokangas
-/tests/lib/lte_lc_api/                    @trantanen @tokangas
+/tests/lib/location/                      @nrfconnect/ncs-modem-tre
+/tests/lib/lte_lc_api/                    @nrfconnect/ncs-modem-tre
 /tests/lib/modem_battery/                 @nrfconnect/ncs-modem
 /tests/lib/modem_info/                    @nrfconnect/ncs-cia
 /tests/lib/modem_jwt/                     @nrfconnect/ncs-iot-oulu
@@ -868,7 +873,7 @@
 /tests/lib/ram_pwrdn/                     @Damian-Nordic
 /tests/lib/sample_rate_converter/         @nrfconnect/ncs-audio
 /tests/lib/sfloat/                        @nrfconnect/ncs-si-muffin
-/tests/lib/sms/                           @trantanen @tokangas
+/tests/lib/sms/                           @nrfconnect/ncs-modem-tre
 /tests/lib/tone/                          @nrfconnect/ncs-audio
 /tests/lib/uicc_lwm2m/                    @stig-bjorlykke
 /tests/mocks/nrf_rpc/                     @nrfconnect/ncs-protocols-serialization
@@ -918,6 +923,7 @@
 /tests/tfm/                               @nrfconnect/ncs-aegir @stephen-nordic @magnev
 /tests/unity/                             @nordic-krch
 /tests/subsys/zigbee/                     @nrfconnect/ncs-zigbee
+/tests/zephyr/drivers/adc/                @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/comparator/         @nrfconnect/ncs-low-level-test
 /tests/zephyr/drivers/flash/common/       @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
 /tests/zephyr/drivers/gpio/               @nrfconnect/ncs-low-level-test

applications/asset_tracker_v2/Kconfig.sysbuild

@@ -32,4 +32,4 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 		&& "${BOARD_REVISION}" != "0.8.5" \
 		&& "${BOARD_REVISION}" != "0.9.0"
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"

applications/connectivity_bridge/Kconfig.sysbuild

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"
 
 config NRF_DEFAULT_IPC_RADIO
 	default y

applications/machine_learning/Kconfig.sysbuild

@@ -33,4 +33,4 @@ config ML_APP_REMOTE_BOARD
 	depends on ML_APP_INCLUDE_REMOTE_IMAGE
 	default "nrf54h20dk/nrf54h20/cpuppr" if BOARD_NRF54H20DK_NRF54H20_CPUAPP
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"

applications/matter_bridge/Kconfig.sysbuild

@@ -68,4 +68,4 @@ endif # BOOTLOADER_MCUBOOT
 config MATTER_FACTORY_DATA_GENERATE
 	default y
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"

applications/matter_bridge/src/app_task.cpp

@@ -88,6 +88,19 @@ void BLEStateChangeCallback(Nrf::BLEConnectivityManager::State state)
 
 #endif /* CONFIG_BRIDGED_DEVICE_BT */
 
+#ifndef CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
+void AppFactoryResetHandler(const ChipDeviceEvent *event, intptr_t /* unused */)
+{
+	switch (event->Type) {
+	case DeviceEventType::kFactoryReset:
+		Nrf::BridgeStorageManager::Instance().FactoryReset();
+		break;
+	default:
+		break;
+	}
+}
+#endif
+
 } /* namespace */
 
 CHIP_ERROR AppTask::RestoreBridgedDevices()
@@ -195,6 +208,14 @@ CHIP_ERROR AppTask::Init()
 	 * network state. */
 	ReturnErrorOnFailure(Nrf::Matter::RegisterEventHandler(Nrf::Board::DefaultMatterEventHandler, 0));
 
+#ifndef CONFIG_CHIP_FACTORY_RESET_ERASE_SETTINGS
+	/* Register factory reset event handler.
+	 * With this configuration we have to manually clean up the storage,
+	 * as whole settings partition won't be erased.
+	 * */
+	ReturnErrorOnFailure(Nrf::Matter::RegisterEventHandler(AppFactoryResetHandler, 0));
+#endif
+
 	return Nrf::Matter::StartServer();
 }
 

applications/matter_weather_station/Kconfig.sysbuild

@@ -50,4 +50,4 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 	default y
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"

applications/nrf5340_audio/Kconfig.sysbuild

@@ -7,4 +7,4 @@
 config NRF_DEFAULT_IPC_RADIO
 	default y
 
-source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"
+source "share/sysbuild/Kconfig"