Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nrfx none resign from alt config #20646

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,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/basic/blinky/ @nrfconnect/ncs-low-level-test @nrfconnect/ncs-ll-ursus
/samples/benchmarks/coremark/ @nrfconnect/ncs-si-bluebagel
/samples/bluetooth/nrf_auraconfig/ @nrfconnect/ncs-audio
/samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin
Expand Down Expand Up @@ -528,7 +529,9 @@
/samples/nfc/ @nrfconnect/ncs-si-muffin
/samples/nrf5340/netboot/ @nrfconnect/ncs-pluto
/samples/nrf_rpc/ @nrfconnect/ncs-si-muffin
/samples/sensor/accel_polling/ @nrfconnect/ncs-low-level-test
/samples/sensor/bh1749/ @nrfconnect/ncs-cia
/samples/sensor/bme680/ @nrfconnect/ncs-low-level-test
/samples/sensor/bme68x_iaq/ @nrfconnect/ncs-cia
/samples/sensor/qdec/ @nrfconnect/ncs-low-level-test
/samples/subsys/settings/ @nrfconnect/ncs-low-level-test
Expand Down Expand Up @@ -704,8 +707,6 @@
/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/twister/alt/zephyr/samples/basic/ @nrfconnect/ncs-ll-ursus
/scripts/twister/alt/zephyr/samples/sensor/ @nrfconnect/ncs-low-level-test
/scripts/twister/alt/zephyr/tests/drivers/ @nrfconnect/ncs-low-level-test

# Share
Expand Down Expand Up @@ -835,6 +836,7 @@
/tests/drivers/flash/flash_rpc/ @nrfconnect/ncs-pluto
/tests/drivers/flash_patch/ @nrfconnect/ncs-pluto
/tests/drivers/fprotect/ @nrfconnect/ncs-pluto
/tests/drivers/i2c/i2c_bme688/ @nrfconnect/ncs-low-level-test
/tests/drivers/lpuart/ @nordic-krch
/tests/drivers/nrfx_integration_test/ @nrfconnect/ncs-co-drivers
/tests/drivers/i2c/i2c_target_api/ @nrfconnect/ncs-low-level-test
Expand Down
11 changes: 11 additions & 0 deletions samples/basic/blinky/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# Copyright (c) 2025 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(blinky)

target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/basic/blinky/src/main.c)
3 changes: 3 additions & 0 deletions samples/basic/blinky/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This sample extends the same-named Zephyr sample to verify it with Nordic development kits.

Source code and basic configuration files can be found in the corresponding folder structure in zephyr/samples/basic/blinky.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

&led0 {
gpios = <&egpio 9 GPIO_ACTIVE_HIGH>;
};
1 change: 1 addition & 0 deletions samples/basic/blinky/prj.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CONFIG_GPIO=y
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ common:
tags:
- LED
- gpio
- ci_tests_drivers_sdp
depends_on: gpio
tests:
sample.basic.blinky:
filter: dt_enabled_alias_with_parent_compat("led0", "gpio-leds")
harness: led
integration_platforms:
- frdm_k64f

sample.basic.blinky.sdp.gpio.icmsg:
nrf.extended.sample.basic.blinky.sdp.gpio.icmsg:
sysbuild: true
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
Expand All @@ -32,7 +28,7 @@ tests:
- "LED state: ON"
- "LED state: OFF"

sample.basic.blinky.sdp.gpio.mbox:
nrf.extended.sample.basic.blinky.sdp.gpio.mbox:
sysbuild: true
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
Expand All @@ -52,7 +48,7 @@ tests:
- "LED state: ON"
- "LED state: OFF"

sample.basic.blinky.sdp.gpio.icbmsg:
nrf.extended.sample.basic.blinky.sdp.gpio.icbmsg:
sysbuild: true
platform_allow:
- nrf54l15dk/nrf54l15/cpuapp
Expand Down
2 changes: 1 addition & 1 deletion samples/drivers/audio/dmic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(dmic)

target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/drivers/audio/dmic/src/main.c)
target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/drivers/audio/dmic/src/main.c)
11 changes: 11 additions & 0 deletions samples/sensor/accel_polling/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# Copyright (c) 2025 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(accel_polling)

target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/sensor/accel_polling/src/main.c)
3 changes: 3 additions & 0 deletions samples/sensor/accel_polling/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This sample extends the same-named Zephyr sample to verify it with Nordic development kits.

Source code and basic configuration files can be found in the corresponding folder structure in zephyr/samples/sensor/accel_polling.
3 changes: 3 additions & 0 deletions samples/sensor/accel_polling/prj.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONFIG_STDOUT_CONSOLE=y
CONFIG_SENSOR=y
CONFIG_CBPRINTF_FP_SUPPORT=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ common:
- drivers
- spi
- sensors
- ci_samples_sensor_accel_polling
harness: console

tests:
sample.sensor.accel_polling.nrf54h:
nrf.extended.sample.sensor.accel_polling.nrf54h:
filter: not CONFIG_COVERAGE
harness_config:
fixture: pca63566
Expand All @@ -24,7 +25,7 @@ tests:
- CONFIG_SENSOR_LOG_LEVEL_DBG=y
platform_allow: nrf54h20dk/nrf54h20/cpuapp

sample.sensor.accel_polling.nrf54h_cpuppr:
nrf.extended.sample.sensor.accel_polling.nrf54h_cpuppr:
filter: not CONFIG_COVERAGE
sysbuild: true
harness_config:
Expand All @@ -38,7 +39,7 @@ tests:
- vpr_launcher_SHIELD=pca63566_fwd
platform_allow: nrf54h20dk/nrf54h20/cpuppr

sample.sensor.accel_polling.nrf54h_coverage:
nrf.extended.sample.sensor.accel_polling.nrf54h_coverage:
filter: CONFIG_COVERAGE
harness_config:
fixture: pca63566
Expand All @@ -50,7 +51,7 @@ tests:
- SHIELD=pca63566;coverage_support
platform_allow: nrf54h20dk/nrf54h20/cpuapp

sample.sensor.accel_polling.nrf54l:
nrf.extended.sample.sensor.accel_polling.nrf54l:
filter: not CONFIG_COVERAGE
harness_config:
fixture: pca63565
Expand All @@ -65,7 +66,7 @@ tests:
- CONFIG_SENSOR_LOG_LEVEL_DBG=y
platform_allow: nrf54l15dk/nrf54l15/cpuapp

sample.sensor.accel_polling.nrf54l_coverage:
nrf.extended.sample.sensor.accel_polling.nrf54l_coverage:
filter: CONFIG_COVERAGE
harness_config:
fixture: pca63565
Expand All @@ -77,7 +78,7 @@ tests:
- SHIELD=pca63565;coverage_support
platform_allow: nrf54l15dk/nrf54l15/cpuapp

sample.sensor.accel_polling.nrf54l15_cpuflpr:
nrf.extended.sample.sensor.accel_polling.nrf54l15_cpuflpr:
filter: not CONFIG_COVERAGE
sysbuild: true
harness_config:
Expand All @@ -88,7 +89,7 @@ tests:
s*-?[0-9\\.]*,\\s*-?[0-9\\.]*\\)$"
extra_args:
- SHIELD=pca63565
- vpr_launcher_DTC_OVERLAY_FILE="../../../../nrf/boards/shields/pca63565/boards/nrf54l15dk_nrf54l15_vpr_launcher.overlay"
- vpr_launcher_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/boards/shields/pca63565/boards/nrf54l15dk_nrf54l15_vpr_launcher.overlay"
extra_configs:
- CONFIG_LOG=y
- CONFIG_SENSOR_LOG_LEVEL_DBG=y
Expand Down
12 changes: 12 additions & 0 deletions samples/sensor/bme680/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# Copyright (c) 2018 Bosch Sensortec GmbH
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(bme680)

FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources})
3 changes: 3 additions & 0 deletions samples/sensor/bme680/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This sample extends the same-named Zephyr sample to verify it with Nordic development kits.

Source code and basic configuration files can be found in the corresponding folder structure in zephyr/samples/sensor/bme680.
3 changes: 3 additions & 0 deletions samples/sensor/bme680/prj.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONFIG_STDOUT_CONSOLE=y
CONFIG_I2C=y
CONFIG_SENSOR=y
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ common:
- drivers
- i2c
- sensors
- ci_samples_sensor_bme680
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

single ci tag please

harness: console

tests:
sample.sensor.bme680.nrf54h:
nrf.extended.sample.sensor.bme680.nrf54h:
filter: not CONFIG_COVERAGE
harness_config:
fixture: pca63566
Expand All @@ -21,7 +22,7 @@ tests:
- SHIELD=pca63566
platform_allow: nrf54h20dk/nrf54h20/cpuapp

sample.sensor.bme680.nrf54h_cpuppr:
nrf.extended.sample.sensor.bme680.nrf54h_cpuppr:
filter: not CONFIG_COVERAGE
sysbuild: true
harness_config:
Expand All @@ -35,7 +36,7 @@ tests:
- vpr_launcher_SHIELD=pca63566_fwd
platform_allow: nrf54h20dk/nrf54h20/cpuppr

sample.sensor.bme680.nrf54h_coverage:
nrf.extended.sample.sensor.bme680.nrf54h_coverage:
filter: CONFIG_COVERAGE
harness_config:
fixture: pca63566
Expand All @@ -47,7 +48,7 @@ tests:
- SHIELD=pca63566;coverage_support
platform_allow: nrf54h20dk/nrf54h20/cpuapp

sample.sensor.bme680.nrf54l:
nrf.extended.sample.sensor.bme680.nrf54l:
filter: not CONFIG_COVERAGE
harness_config:
fixture: pca63565
Expand All @@ -59,7 +60,7 @@ tests:
- SHIELD=pca63565
platform_allow: nrf54l15dk/nrf54l15/cpuapp

sample.sensor.bme680.nrf54l_coverage:
nrf.extended.sample.sensor.bme680.nrf54l_coverage:
filter: CONFIG_COVERAGE
harness_config:
fixture: pca63565
Expand All @@ -71,7 +72,7 @@ tests:
- SHIELD=pca63565;coverage_support
platform_allow: nrf54l15dk/nrf54l15/cpuapp

sample.sensor.bme680.nrf54l_cpuflpr:
nrf.extended.sample.sensor.bme680.nrf54l_cpuflpr:
filter: not CONFIG_COVERAGE
sysbuild: true
harness_config:
Expand All @@ -82,5 +83,5 @@ tests:
.]*$"
extra_args:
- SHIELD=pca63565
- vpr_launcher_DTC_OVERLAY_FILE="../../../../nrf/boards/shields/pca63565/boards/nrf54l15dk_nrf54l15_vpr_launcher.overlay"
- vpr_launcher_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/boards/shields/pca63565/boards/nrf54l15dk_nrf54l15_vpr_launcher.overlay"
platform_allow: nrf54l15dk/nrf54l15/cpuflpr
43 changes: 43 additions & 0 deletions samples/sensor/bme680/src/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (c) 2018 Bosch Sensortec GmbH
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/drivers/sensor.h>
#include <stdio.h>

int main(void)
{
const struct device *const dev = DEVICE_DT_GET_ONE(bosch_bme680);
struct sensor_value temp, press, humidity, gas_res;

if (!device_is_ready(dev)) {
printk("sensor: device not ready.\n");
return 0;
}

printf("Device %p name is %s\n", dev, dev->name);

#ifndef CONFIG_COVERAGE
while (1) {
#else
for (int i = 0; i < 5; i++) {
#endif
k_sleep(K_MSEC(3000));

sensor_sample_fetch(dev);
sensor_channel_get(dev, SENSOR_CHAN_AMBIENT_TEMP, &temp);
sensor_channel_get(dev, SENSOR_CHAN_PRESS, &press);
sensor_channel_get(dev, SENSOR_CHAN_HUMIDITY, &humidity);
sensor_channel_get(dev, SENSOR_CHAN_GAS_RES, &gas_res);

printf("T: %d.%06d; P: %d.%06d; H: %d.%06d; G: %d.%06d\n",
temp.val1, temp.val2, press.val1, press.val2,
humidity.val1, humidity.val2, gas_res.val1,
gas_res.val2);
}
return 0;
}
2 changes: 1 addition & 1 deletion samples/sensor/qdec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(qdec_sensor)

target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/sensor/qdec/src/main.c)
target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/sensor/qdec/src/main.c)
2 changes: 1 addition & 1 deletion samples/subsys/settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ cmake_minimum_required(VERSION 3.20.0)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(settings_sample)

target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/subsys/settings/src/main.c)
target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/subsys/settings/src/main.c)
17 changes: 17 additions & 0 deletions scripts/ci/tags.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,8 @@ ci_tests_drivers_sdp:
- nrf/tests/drivers/sdp_asm/
- zephyr/drivers/mbox/
- zephyr/subsys/ipc/ipc_service/
- nrf/samples/basic/blinky/
- zephyr/samples/basic/blinky/

ci_tests_drivers_gpio:
files:
Expand Down Expand Up @@ -1516,6 +1518,16 @@ ci_samples_nrf5340:
- zephyr/subsys/shell/
- zephyr/subsys/usb/

ci_samples_sensor_accel_polling:
files:
- nrf/samples/sensor/accel_polling/
- zephyr/samples/sensor/accel_polling/

ci_samples_sensor_bme680:
files:
- nrf/samples/sensor/bme680/
- zephyr/samples/sensor/bme680/

ci_samples_sensor_qdec:
files:
- nrf/samples/sensor/qdec/
Expand All @@ -1531,6 +1543,11 @@ ci_samples_drivers_audio_dmic:
- nrf/samples/drivers/audio/dmic/
- zephyr/samples/drivers/audio/dmic/

ci_tests_drivers_i2c_i2c_bme688:
files:
- nrf/tests/drivers/i2c/i2c_bme688
- zephyr/tests/drivers/i2c/i2c_bme688

ci_tests_drivers_spi:
files:
- nrf/tests/drivers/spi/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(KCONFIG_ROOT $ENV{ZEPHYR_BASE}/samples/boards/nordic/system_off/Kconfig)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(system_off)

target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/system_off/src/main.c)
target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/boards/nordic/system_off/src/main.c)
if(CONFIG_APP_USE_NRF_RETENTION OR CONFIG_APP_USE_RETAINED_MEM)
target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/boards/nordic/system_off/src/retained.c)
target_sources(app PRIVATE ${ZEPHYR_BASE}/samples/boards/nordic/system_off/src/retained.c)
endif()
13 changes: 13 additions & 0 deletions tests/drivers/i2c/i2c_bme688/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Copyright (c) 2025 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

cmake_minimum_required(VERSION 3.20.0)

find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(i2c_bme688)

FILE(GLOB app_sources ${ZEPHYR_BASE}/tests/drivers/i2c/i2c_bme688/src/*.c)
target_sources(app PRIVATE ${app_sources})
Loading