From 7314be12ae8ae769bea1b7fee03e7896a71b787b Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:13:53 +0000 Subject: [PATCH 1/6] update sample to zephyr 3.7.0 --- .github/workflows/build_test.yml | 2 +- samples/uptime/prj.conf | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 9041bc7..239f2d3 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -14,7 +14,7 @@ jobs: container: ghcr.io/zephyrproject-rtos/ci:v0.26.2 env: CMAKE_PREFIX_PATH: /opt/toolchains - ZEPHYR_VERSION: 3.6.0 + ZEPHYR_VERSION: 3.7.0 # Board to use with renode BOARD: nrf52840dk_nrf52840 steps: diff --git a/samples/uptime/prj.conf b/samples/uptime/prj.conf index fea6d49..377e42a 100644 --- a/samples/uptime/prj.conf +++ b/samples/uptime/prj.conf @@ -3,16 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # - +CONFIG_CPP=y +CONFIG_STD_CPP17=y CONFIG_BT=y -CONFIG_BT_DEBUG_LOG=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_DEVICE_NAME="BLEUtils_Uptime" - -CONFIG_CPLUSPLUS=y -CONFIG_LIB_CPLUSPLUS=y -CONFIG_STD_CPP17=y -CONFIG_NEWLIB_LIBC=y CONFIG_BLE_UTILS=y CONFIG_BT_ASSERT=n CONFIG_LOG=y From dd3c770e6986dcd842293a1054d3bad965d076dd Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:19:10 +0000 Subject: [PATCH 2/6] update central prj.conf to zephyr 3.7.0 --- tests/renode/ble_central/prj.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/renode/ble_central/prj.conf b/tests/renode/ble_central/prj.conf index 6203941..03b6742 100644 --- a/tests/renode/ble_central/prj.conf +++ b/tests/renode/ble_central/prj.conf @@ -3,10 +3,8 @@ #--------- #C++ #---------- -CONFIG_CPLUSPLUS=y -CONFIG_LIB_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_STD_CPP17=y -CONFIG_NEWLIB_LIBC=y CONFIG_UART_CONSOLE=y CONFIG_BLE_UTILS=y CONFIG_CBPRINTF_FP_SUPPORT=y From 757c6fce38dcfb7ed10d1f17c3dc9e7035341169 Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:44:36 +0000 Subject: [PATCH 3/6] add missing lib conf --- tests/renode/ble_central/prj.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/renode/ble_central/prj.conf b/tests/renode/ble_central/prj.conf index 03b6742..344bf0e 100644 --- a/tests/renode/ble_central/prj.conf +++ b/tests/renode/ble_central/prj.conf @@ -5,6 +5,7 @@ #---------- CONFIG_CPP=y CONFIG_STD_CPP17=y +CONFIG_REQUIRES_FULL_LIBCPP=y CONFIG_UART_CONSOLE=y CONFIG_BLE_UTILS=y CONFIG_CBPRINTF_FP_SUPPORT=y From 829bf5595d09221f2c6ea1df68b544e903a9a349 Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:21:43 +0100 Subject: [PATCH 4/6] update renode 1.15.3 --- .github/workflows/build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 239f2d3..6b71217 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -68,7 +68,7 @@ jobs: - name: Run tests on latest Renode uses: antmicro/renode-test-action@v3.0.0 with: - renode-version: '1.13.3' + renode-version: '1.15.3' tests-to-run: 'tests/renode/uptime_test.robot' artifacts-path: ${{ github.workspace }} From febe6acb05ac34804b053f828fdad6962d46176b Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:34:16 +0100 Subject: [PATCH 5/6] Update build_test.yml --- .github/workflows/build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 6b71217..342986d 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -75,7 +75,6 @@ jobs: - name: Archive latest results uses: actions/upload-artifact@v4 - if: failure() with: name: test-results-latest path: | From 07e84d5bab541667abd5adb6f2ebdb01c0aa6ef9 Mon Sep 17 00:00:00 2001 From: Victor Chavez Date: Sun, 3 Nov 2024 21:40:20 +0100 Subject: [PATCH 6/6] samples: increase adv len uptime sample requires increase in adv. len for zephyr 3.7.0, if not adv. start fails as defined in: https://github.com/zephyrproject-rtos/zephyr/blob/e90c58a5b1ca4c9b040eb343d9c10b8ba59f3beb/subsys/bluetooth/host/adv.c#L665 --- samples/uptime/prj.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/uptime/prj.conf b/samples/uptime/prj.conf index 377e42a..6783a7d 100644 --- a/samples/uptime/prj.conf +++ b/samples/uptime/prj.conf @@ -11,4 +11,5 @@ CONFIG_BT_DEVICE_NAME="BLEUtils_Uptime" CONFIG_BLE_UTILS=y CONFIG_BT_ASSERT=n CONFIG_LOG=y -CONFIG_BT_EXT_ADV=y \ No newline at end of file +CONFIG_BT_EXT_ADV=y +CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=100 \ No newline at end of file