From eba005e3d955f2eca76b1f045c885b35ed3e8fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Baczma=C5=84ski?= Date: Wed, 14 Aug 2024 16:56:54 +0200 Subject: [PATCH] update ncs to `3203d1319278a4b8abd02e53043b6487ec8f7bc5` (#85) OpenThread version inside: `a759a4a09f9fe5bdf757c470aa86dffdc7a349f1` Signed-off-by: Maciej Baczmanski --- CHANGELOG.txt | 3 +++ config/ncs/overlay-cli-1_4.conf | 44 +++++++++++++++++++++++++++++++++ config/ncs/overlay-rcp-1_4.conf | 28 +++++++++++++++++++++ config/ncs/sdk-nrf-commit | 2 +- script/make-firmware.bash | 6 ++++- 5 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 config/ncs/overlay-cli-1_4.conf create mode 100644 config/ncs/overlay-rcp-1_4.conf diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bd9dc76..c627d72 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -13,6 +13,9 @@ FEATURES CHANGELOG ========== +* 08/13/2024 + * Updated NCS to `3203d13` + * 08/08/2024 * Updated submodules * ot-commissioner commitid: 639e627 diff --git a/config/ncs/overlay-cli-1_4.conf b/config/ncs/overlay-cli-1_4.conf new file mode 100644 index 0000000..77b9dcc --- /dev/null +++ b/config/ncs/overlay-cli-1_4.conf @@ -0,0 +1,44 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Enable reference device +CONFIG_OPENTHREAD_REFERENCE_DEVICE=y + +# Enable OpenThread features set for Thread 1.4 +CONFIG_OPENTHREAD_THREAD_VERSION_1_4=y +CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y + +# Disable most of the logging +CONFIG_LOG_MODE_DEFERRED=y +CONFIG_BOOT_BANNER=n +CONFIG_LOG=y +CONFIG_NET_LOG=n +CONFIG_NET_STATISTICS=n +CONFIG_OPENTHREAD_DEBUG=n +CONFIG_OPENTHREAD_L2_DEBUG=y + +# Shell configuration for harness +CONFIG_SHELL_PROMPT_UART="" +CONFIG_SHELL_VT100_COLORS=n +CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=1024 +CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=1024 +CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH=640 +CONFIG_SHELL_CMD_BUFF_SIZE=640 +CONFIG_OPENTHREAD_CLI_MAX_LINE_LENGTH=640 + +# Number of external addresses +CONFIG_OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS=4 + +# Increase stack +CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144 + +# Set USB device PID +CONFIG_USB_DEVICE_PID=0xCAFF + +# Configure Thread 1.2 features +CONFIG_OPENTHREAD_CSL_AUTO_SYNC=n +CONFIG_OPENTHREAD_MIN_RECEIVE_ON_AHEAD=104 +CONFIG_OPENTHREAD_MIN_RECEIVE_ON_AFTER=0 diff --git a/config/ncs/overlay-rcp-1_4.conf b/config/ncs/overlay-rcp-1_4.conf new file mode 100644 index 0000000..514c439 --- /dev/null +++ b/config/ncs/overlay-rcp-1_4.conf @@ -0,0 +1,28 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Enable reference device +CONFIG_OPENTHREAD_REFERENCE_DEVICE=y + +# Enable OpenThread features set for Thread 1.4 +CONFIG_OPENTHREAD_THREAD_VERSION_1_4=y +CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y + +# Enable RCP coprocessor +CONFIG_OPENTHREAD_COPROCESSOR_RCP=y + +# Set USB device PID +CONFIG_USB_DEVICE_PID=0xCAFF + +# Configure logging +CONFIG_LOG=y +CONFIG_LOG_BACKEND_SPINEL=y +CONFIG_LOG_BACKEND_UART=n + +# Configure Thread 1.2 features +CONFIG_OPENTHREAD_CSL_AUTO_SYNC=n +CONFIG_OPENTHREAD_MIN_RECEIVE_ON_AHEAD=104 +CONFIG_OPENTHREAD_MIN_RECEIVE_ON_AFTER=0 diff --git a/config/ncs/sdk-nrf-commit b/config/ncs/sdk-nrf-commit index d94b60d..6930d1b 100644 --- a/config/ncs/sdk-nrf-commit +++ b/config/ncs/sdk-nrf-commit @@ -1 +1 @@ -52623f18f0b0da420195cc93c3002b283d7d260b +3203d1319278a4b8abd02e53043b6487ec8f7bc5 diff --git a/script/make-firmware.bash b/script/make-firmware.bash index c3e8d38..45c3e0c 100755 --- a/script/make-firmware.bash +++ b/script/make-firmware.bash @@ -341,6 +341,8 @@ package_ncs() distribute "/tmp/ncs_rcp_1_2/coprocessor/zephyr/zephyr.hex" "ot-rcp" "1.2" "${timestamp}" "${commit_id}" distribute "/tmp/ncs_cli_1_3/cli/zephyr/zephyr.hex" "ot-cli-ftd" "1.3" "${timestamp}" "${commit_id}" distribute "/tmp/ncs_rcp_1_3/coprocessor/zephyr/zephyr.hex" "ot-rcp" "1.3" "${timestamp}" "${commit_id}" + distribute "/tmp/ncs_cli_1_4/cli/zephyr/zephyr.hex" "ot-cli-ftd" "1.4" "${timestamp}" "${commit_id}" + distribute "/tmp/ncs_rcp_1_4/coprocessor/zephyr/zephyr.hex" "ot-rcp" "1.4" "${timestamp}" "${commit_id}" } build_ncs() @@ -354,8 +356,10 @@ build_ncs() local rcp_1_2=("/tmp/ncs_rcp_1_2" "samples/openthread/coprocessor/" "${script_dir}/../config/ncs/overlay-rcp-1_2.conf") local cli_1_3=("/tmp/ncs_cli_1_3" "samples/openthread/cli/" "${script_dir}/../config/ncs/overlay-cli-1_3.conf") local rcp_1_3=("/tmp/ncs_rcp_1_3" "samples/openthread/coprocessor/" "${script_dir}/../config/ncs/overlay-rcp-1_3.conf") + local cli_1_4=("/tmp/ncs_cli_1_4" "samples/openthread/cli/" "${script_dir}/../config/ncs/overlay-cli-1_4.conf") + local rcp_1_4=("/tmp/ncs_rcp_1_4" "samples/openthread/coprocessor/" "${script_dir}/../config/ncs/overlay-rcp-1_4.conf") - local variants=(cli_1_1[@] cli_1_2[@] rcp_1_2[@] cli_1_3[@] rcp_1_3[@]) + local variants=(cli_1_1[@] cli_1_2[@] rcp_1_2[@] cli_1_3[@] rcp_1_3[@] cli_1_4[@] rcp_1_4[@]) cd nrf for variant in "${variants[@]}"; do