From 94ceea9bf70f1b8a80bbbac19b3566492d252057 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Mon, 20 Jan 2025 10:34:23 +0100 Subject: [PATCH 1/2] samples: update ble and ipc configuration Symbsld changed in nrf upmerge https://github.com/nrfconnect/sdk-nrf/pull/19720 Signed-off-by: Krzysztof Taborowski --- .../sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.overlay | 6 ------ .../sid_end_device/boards/thingy53_nrf5340_cpuapp.overlay | 6 ------ subsys/sal/sid_pal/src/sid_ble_advert.c | 2 +- utils/sidewalk_dfu/nordic_dfu.c | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.overlay index 2596cfea50..803f4b00b5 100644 --- a/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/sid_end_device/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -4,12 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - -&ipc0 { - zephyr,priority = <0 PRIO_COOP>; -}; - sid_semtech: &spi4 { compatible = "nordic,nrf-spim"; status = "okay"; diff --git a/samples/sid_end_device/boards/thingy53_nrf5340_cpuapp.overlay b/samples/sid_end_device/boards/thingy53_nrf5340_cpuapp.overlay index 048337fbe7..707d462221 100644 --- a/samples/sid_end_device/boards/thingy53_nrf5340_cpuapp.overlay +++ b/samples/sid_end_device/boards/thingy53_nrf5340_cpuapp.overlay @@ -4,12 +4,6 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - -&ipc0 { - zephyr,priority = <0 PRIO_COOP>; -}; - &i2c1 { status = "okay"; diff --git a/subsys/sal/sid_pal/src/sid_ble_advert.c b/subsys/sal/sid_pal/src/sid_ble_advert.c index 4f86c180f0..2caa744910 100644 --- a/subsys/sal/sid_pal/src/sid_ble_advert.c +++ b/subsys/sal/sid_pal/src/sid_ble_advert.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(sid_ble_advert, CONFIG_SIDEWALK_BLE_ADAPTER_LOG_LEVEL); #define MS_TO_INTERVAL_VAL(ms) (uint16_t)((ms) / 0.625f) -#define AMA_ADV_OPTIONS (BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_ONE_TIME) +#define AMA_ADV_OPTIONS (BT_LE_ADV_OPT_CONN) #if 10240 < (CONFIG_SIDEWALK_BLE_ADV_INT_FAST + CONFIG_SIDEWALK_BLE_ADV_INT_PRECISION) #error "Invalid value for CONFIG_SIDEWALK_BLE_ADV_INT_FAST or CONFIG_SIDEWALK_BLE_ADV_INT_PRECISION, sum of those values have to be smaller than 10240" diff --git a/utils/sidewalk_dfu/nordic_dfu.c b/utils/sidewalk_dfu/nordic_dfu.c index f64bff7dcf..0743e5c773 100644 --- a/utils/sidewalk_dfu/nordic_dfu.c +++ b/utils/sidewalk_dfu/nordic_dfu.c @@ -34,7 +34,7 @@ static struct k_work exit_dfu = Z_WORK_INITIALIZER(deinit_nordic_dfu); static struct bt_le_adv_param adv_params = { .id = BT_ID_DEFAULT, .sid = 0, .secondary_max_skip = 0, - .options = BT_LE_ADV_OPT_CONNECTABLE, + .options = BT_LE_ADV_OPT_CONN, .interval_min = BT_GAP_ADV_SLOW_INT_MIN, .interval_max = BT_GAP_ADV_SLOW_INT_MAX, .peer = NULL }; From 8d39cc8eaaa3a58005259a4d6b02dbcec8755adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Tue, 21 Jan 2025 09:45:10 +0000 Subject: [PATCH 2/2] GHA: fix typo in twister command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use proper option for twister level Signed-off-by: Robert Gałat --- .github/workflows/run_tests_dut.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_dut.yml b/.github/workflows/run_tests_dut.yml index b2f3c2a994..7e356d76f1 100644 --- a/.github/workflows/run_tests_dut.yml +++ b/.github/workflows/run_tests_dut.yml @@ -79,7 +79,7 @@ jobs: - name: Build DUT test artifacts run: | source zephyr/zephyr-env.sh - west twister --test-config sidewalk/test_config.yaml --levels="Github_tests" --platform ${{inputs.target_board}} --testsuite-root sidewalk --filter runnable --shuffle-tests --shuffle-tests-seed 123 --inline-logs --overflow-as-errors -vvv --prep-artifacts-for-testing --package-artifacts PACKAGE_ARTIFACTS_${{ inputs.subset }}.tar.bz2 --subset ${{ inputs.subset }}/${{ inputs.max_subsets }} + west twister --test-config sidewalk/test_config.yaml --level="Github_tests" --platform ${{inputs.target_board}} --testsuite-root sidewalk --shuffle-tests --shuffle-tests-seed 123 --inline-logs --overflow-as-errors -vvv --prep-artifacts-for-testing --package-artifacts PACKAGE_ARTIFACTS_${{ inputs.subset }}.tar.bz2 --subset ${{ inputs.subset }}/${{ inputs.max_subsets }} - name: Print ccache stats run: |