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

Upmerge 16.05.2024 #563

Merged
merged 6 commits into from
May 28, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
boards_to_test:
type: string
required: false
default: '["nrf52840dk/nrf52840", "nrf5340dk/nrf5340/cpuapp", "nrf54l15pdk@0.3.0/nrf54l15/cpuapp"]'
default: '["nrf52840dk/nrf52840", "nrf5340dk/nrf5340/cpuapp", "nrf54l15pdk/nrf54l15/cpuapp"]'

jobs:
build_manual_tests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
*/


/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
&cpuapp_rram {
reg = < 0x0 DT_SIZE_K(1524) >;
};

&pinctrl {
spi21_default: spi21_default {
group1 {
Expand Down
1 change: 1 addition & 0 deletions samples/sid_end_device/child_image/mcuboot/prj.conf
ktaborowski marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_MINIMAL_LIBC=y

# Bootloader size optimization
CONFIG_NCS_BOOT_BANNER=n
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_MINIMAL_LIBC=y

# Bootloader size optimization
CONFIG_NCS_BOOT_BANNER=n
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
Expand Down
4 changes: 2 additions & 2 deletions samples/sid_end_device/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ common:
platform_allow:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tests:
sample.sidewalk.hello:
extra_configs:
Expand Down
7 changes: 4 additions & 3 deletions samples/sid_end_device/src/sensor_monitoring/app_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ static void state_notify_data(void *o);
static void button_timer_cb(struct k_timer *timer_id);

static const struct smf_state app_states[] = {
[STATE_APP_INIT] = SMF_CREATE_STATE(NULL, state_init, NULL),
[STATE_APP_NOTIFY_CAPABILITY] = SMF_CREATE_STATE(NULL, state_notify_capability, NULL),
[STATE_APP_NOTIFY_DATA] = SMF_CREATE_STATE(NULL, state_notify_data, NULL),
[STATE_APP_INIT] = SMF_CREATE_STATE(NULL, state_init, NULL, NULL, NULL),
[STATE_APP_NOTIFY_CAPABILITY] =
SMF_CREATE_STATE(NULL, state_notify_capability, NULL, NULL, NULL),
[STATE_APP_NOTIFY_DATA] = SMF_CREATE_STATE(NULL, state_notify_data, NULL, NULL, NULL),
};

static uint8_t __aligned(4)
Expand Down
4 changes: 2 additions & 2 deletions samples/sid_end_device/src/sidewalk.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ static void state_dfu_run(void *o);

static const struct smf_state sid_states[] = {
[STATE_SIDEWALK] =
SMF_CREATE_STATE(state_sidewalk_entry, state_sidewalk_run, state_sidewalk_exit),
[STATE_DFU] = SMF_CREATE_STATE(state_dfu_entry, state_dfu_run, NULL),
SMF_CREATE_STATE(state_sidewalk_entry, state_sidewalk_run, state_sidewalk_exit, NULL, NULL),
[STATE_DFU] = SMF_CREATE_STATE(state_dfu_entry, state_dfu_run, NULL, NULL, NULL),
};

static uint8_t __aligned(4)
Expand Down
1 change: 0 additions & 1 deletion samples/sid_end_device/sysbuild/hci_ipc/prj.conf
ktaborowski marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_HCI_RAW_RESERVE=1

# Workaround: Unable to allocate command buffer when using K_NO_WAIT since
# Host number of completed commands does not follow normal flow control.
Expand Down
1 change: 1 addition & 0 deletions samples/sid_end_device/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_MINIMAL_LIBC=y

# Bootloader size optimization
CONFIG_NCS_BOOT_BANNER=n
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/critical_region/testcase.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tests:
sidewalk.functional.critical_region:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/functional/crypto/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ tests:
sidewalk.functional.crypto:
sysbuild: true
tags: Sidewalk
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/functional/interrupts/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ tests:
unity.sidewalk.functional.interrupts:
sysbuild: true
tags: Sidewalk
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/functional/mfg_storage/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ tests:
skip: true
sysbuild: true
tags: Sidewalk
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/functional/pal_delay/testcase.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests:
sidewalk.functional.delay:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
4 changes: 2 additions & 2 deletions tests/functional/spi_bus/testcase.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
tests:
sidewalk.functional.spi_bus:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
harness: ztest
harness_config:
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/storage/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ tests:
sidewalk.functional.storage:
sysbuild: true
tags: Sidewalk
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/functional/temperature/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ tests:
platform_allow:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp temperature sensor not working
# - nrf54l15pdk/nrf54l15/cpuapp temperature sensor not working
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
# - nrf54l15pdk@0.3.0/nrf54l15/cpuapp temperature sensor not working
# - nrf54l15pdk/nrf54l15/cpuapp temperature sensor not working
tags: Sidewalk
4 changes: 2 additions & 2 deletions tests/manual/ble/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ sample:
tests:
sidewalk.test.ble:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
build_only: true
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
4 changes: 2 additions & 2 deletions tests/manual/log/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ sample:
tests:
sidewalk.test.log:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
build_only: true
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/


/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
&cpuapp_rram {
reg = < 0x0 DT_SIZE_K(1524) >;
};
4 changes: 2 additions & 2 deletions tests/manual/simple_bootloader/sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ tests:
sidewalk.test.simple_bootloader:
sysbuild: true
build_only: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
1 change: 1 addition & 0 deletions tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_MINIMAL_LIBC=y

# Bootloader size optimization
CONFIG_NCS_BOOT_BANNER=n
CONFIG_CONSOLE=n
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
Expand Down
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_ace_alloc/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ tests:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- native_posix
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
integration_platforms:
- native_posix
- nrf52840dk/nrf52840
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/unit_tests/sid_dut_shell/mock/shell_mock.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

DEFINE_FFF_GLOBALS;

FAKE_VOID_FUNC_VARARG(shell_fprintf, const struct shell *, enum shell_vt100_color, const char *,
...);
FAKE_VOID_FUNC_VARARG(shell_fprintf_impl, const struct shell *, enum shell_vt100_color,
const char *, ...);
4 changes: 2 additions & 2 deletions tests/validation/crypto/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ tests:
platform_allow:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/validation/storage_kv/testcase.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests:
sidewalk.sid_validation.pal_storage_kv:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
4 changes: 2 additions & 2 deletions tests/validation/timer/testcase.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests:
sidewalk.sid_validation.pal_timer:
sysbuild: true
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp
platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp
tags: Sidewalk
integration_platforms:
- nrf52840dk/nrf52840
- nrf5340dk/nrf5340/cpuapp
- nrf54l15pdk@0.3.0/nrf54l15/cpuapp
- nrf54l15pdk/nrf54l15/cpuapp
2 changes: 1 addition & 1 deletion utils/src/nordic_dfu.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ int nordic_dfu_ble_start(void)

mgmt_callback_register(&dfu_mode_mgmt_cb);

err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0);
err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0);
if (err) {
LOG_ERR("Bluetooth advertising start failed (err %d)", err);
return err;
Expand Down