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.

Sign up for GitHub

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

Jump to bottom

Update NCS and submodules #62

Merged
merged 3 commits into from
Jul 19, 2023
Merged

Update NCS and submodules #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f9860b
Update submodules
maciejbaczmanski Jul 11, 2023
670b8d6
Update NCS
maciejbaczmanski Jul 11, 2023
348c1f2
OT BR building fixes
maciejbaczmanski Jul 11, 2023
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
7 changes: 7 additions & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ FEATURES

CHANGELOG
==========
* 07/11/2023
* Updated submodules
* openthread commitid: 8bc2504
* ot-br-posix commitid: 790dc77
* ot-nrf528xx commitid: 982244f
* ot-commisioner commitid: acb3371
* Updated NCS to `4d1c577`
* 05/26/2023
* Updated submodules
* openthread commitid: 6865b83d7
Expand Down
12 changes: 1 addition & 11 deletions config/ncs/overlay-cli-1_1.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,5 @@ CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH=640
# Increase stack
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144

# Enable USB transport
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
CONFIG_USB_DEVICE_VID=0x1915
# Set USB device PID
CONFIG_USB_DEVICE_PID=0xCAFF
12 changes: 1 addition & 11 deletions config/ncs/overlay-cli-1_2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,7 @@ CONFIG_OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS=4
# Increase stack
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144

# Enable USB transport
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
CONFIG_USB_DEVICE_VID=0x1915
# Set USB device PID
CONFIG_USB_DEVICE_PID=0xCAFF

# Configure Thread 1.2 features
Expand Down
12 changes: 1 addition & 11 deletions config/ncs/overlay-cli-1_3.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,7 @@ CONFIG_OPENTHREAD_IP6_MAX_EXT_MCAST_ADDRS=4
# Increase stack
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2144

# Enable USB transport
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y
CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
CONFIG_USB_DEVICE_PRODUCT="Thread Reference Device"
CONFIG_USB_DEVICE_VID=0x1915
# Set USB device PID
CONFIG_USB_DEVICE_PID=0xCAFF

# Configure Thread 1.2 features
Expand Down
12 changes: 3 additions & 9 deletions config/ncs/overlay-rcp-1_2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y
# Enable RCP coprocessor
CONFIG_OPENTHREAD_COPROCESSOR_RCP=y

# Use USB-CDC-ACM for Co-Processor
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_USB_CDC_ACM=y
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor"
CONFIG_USB_DEVICE_VID=0x1915
# Set USB device PID
CONFIG_USB_DEVICE_PID=0xCAFF
CONFIG_UART_LINE_CTRL=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n

# Configure logging
CONFIG_LOG_BACKEND_SPINEL=y
CONFIG_LOG=y

Expand Down
12 changes: 3 additions & 9 deletions config/ncs/overlay-rcp-1_3.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ CONFIG_OPENTHREAD_NORDIC_LIBRARY_MASTER=y
# Enable RCP coprocessor
CONFIG_OPENTHREAD_COPROCESSOR_RCP=y

# Use USB-CDC-ACM for Co-Processor
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
CONFIG_USB_CDC_ACM=y
CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor"
CONFIG_USB_DEVICE_VID=0x1915
# Set USB device PID
CONFIG_USB_DEVICE_PID=0xCAFF
CONFIG_UART_LINE_CTRL=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n

# Configure logging
CONFIG_LOG_BACKEND_SPINEL=y
CONFIG_LOG=y

Expand Down
2 changes: 1 addition & 1 deletion config/ncs/sdk-nrf-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e434ec2f11f2fed6bd24c2f0bc2c3e98486d2a90
4d1c577ef2cadc7f9270c575ec3808cf892c9f34
2 changes: 1 addition & 1 deletion openthread
Open in desktop
Submodule openthread updated 876 files
2 changes: 1 addition & 1 deletion ot-br-posix
Open in desktop
Submodule ot-br-posix updated 95 files
+2 −2 .github/workflows/border_router.yml
+4 −4 .github/workflows/docker.yml
+4 −2 .github/workflows/documentation.yml
+1 −1 .github/workflows/macOS.yml
+1 −0 CMakeLists.txt
+19 −0 etc/cmake/options.cmake
+4 −1 script/_nat64
+2 −2 script/_otbr
+1 −1 script/bootstrap
+2 −2 script/cmake-build
+4 −3 script/test
+1 −1 src/CMakeLists.txt
+2 −0 src/agent/CMakeLists.txt
+4 −2 src/agent/application.cpp
+6 −1 src/agent/application.hpp
+13 −1 src/agent/main.cpp
+2 −2 src/agent/openthread-otbr-posix-config.h.in
+2 −0 src/agent/vendor.hpp
+2 −0 src/backbone_router/backbone_agent.hpp
+2 −0 src/backbone_router/constants.hpp
+2 −0 src/backbone_router/dua_routing_manager.hpp
+2 −0 src/backbone_router/nd_proxy.hpp
+19 −0 src/border_agent/border_agent.cpp
+2 −0 src/border_agent/border_agent.hpp
+1 −0 src/common/CMakeLists.txt
+55 −0 src/common/api_strings.cpp
+52 −0 src/common/api_strings.hpp
+2 −0 src/common/byteswap.hpp
+20 −6 src/common/callback.hpp
+18 −15 src/common/code_utils.hpp
+2 −0 src/common/dns_utils.hpp
+2 −0 src/dbus/client/client_error.hpp
+11 −0 src/dbus/client/thread_api_dbus.cpp
+28 −0 src/dbus/client/thread_api_dbus.hpp
+3 −6 src/dbus/common/constants.hpp
+2 −0 src/dbus/common/dbus_message_dump.hpp
+4 −2 src/dbus/common/dbus_message_helper.hpp
+13 −2 src/dbus/common/dbus_message_helper_openthread.cpp
+2 −0 src/dbus/common/dbus_resources.hpp
+2 −0 src/dbus/common/error.hpp
+2 −0 src/dbus/common/types.hpp
+2 −2 src/dbus/server/CMakeLists.txt
+2 −0 src/dbus/server/dbus_agent.hpp
+2 −0 src/dbus/server/dbus_object.hpp
+7 −0 src/dbus/server/dbus_request.hpp
+207 −27 src/dbus/server/dbus_thread_object.cpp
+6 −0 src/dbus/server/dbus_thread_object.hpp
+2 −0 src/dbus/server/error_helper.hpp
+31 −3 src/dbus/server/introspect.xml
+5 −5 src/mdns/mdns.cpp
+8 −5 src/mdns/mdns.hpp
+140 −63 src/mdns/mdns_avahi.cpp
+115 −70 src/mdns/mdns_avahi.hpp
+2 −0 src/mdns/mdns_mdnssd.hpp
+7 −0 src/ncp/ncp_openthread.cpp
+2 −0 src/ncp/ncp_openthread.hpp
+1 −1 src/openwrt/view/admin_thread/thread_view.htm
+8 −0 src/proto/CMakeLists.txt
+14 −0 src/proto/capabilities.proto
+2 −0 src/proto/feature_flag.proto
+76 −0 src/proto/thread_telemetry.proto
+2 −0 src/rest/connection.hpp
+445 −1 src/rest/json.cpp
+59 −0 src/rest/json.hpp
+455 −0 src/rest/openapi.yaml
+26 −2 src/rest/parser.cpp
+2 −0 src/rest/parser.hpp
+18 −0 src/rest/request.cpp
+36 −6 src/rest/request.hpp
+250 −48 src/rest/resource.cpp
+24 −3 src/rest/resource.hpp
+7 −3 src/rest/response.cpp
+10 −0 src/rest/response.hpp
+2 −4 src/rest/rest_web_server.cpp
+3 −1 src/rest/rest_web_server.hpp
+22 −9 src/rest/types.hpp
+2 −0 src/sdp_proxy/advertising_proxy.hpp
+2 −0 src/sdp_proxy/discovery_proxy.hpp
+2 −0 src/trel_dnssd/trel_dnssd.hpp
+26 −12 src/utils/hex.cpp
+40 −0 src/utils/hex.hpp
+2 −0 src/utils/infra_link_selector.hpp
+2 −0 src/utils/system_utils.hpp
+21 −47 src/utils/thread_helper.cpp
+2 −0 src/utils/thread_helper.hpp
+7 −0 tests/dbus/CMakeLists.txt
+0 −40 tests/dbus/keep_running.sh
+127 −75 tests/dbus/test-client
+54 −0 tests/dbus/test_dbus_client.cpp
+4 −0 tests/rest/test-rest-server
+2 −2 tests/rest/test_rest.py
+1 −0 tests/scripts/check-scan-build
+1 −1 tests/scripts/openwrt
+4 −1 third_party/openthread/CMakeLists.txt
+1 −1 third_party/openthread/repo
2 changes: 1 addition & 1 deletion ot-commissioner
Open in desktop
Submodule ot-commissioner updated 3 files
+1 −1 .github/workflows/tests.yml
+15 −6 tests/integration/common.sh
+11 −4 tests/integration/test_native_commissioner.sh
2 changes: 1 addition & 1 deletion ot-nrf528xx
Open in desktop
Submodule ot-nrf528xx updated 8 files
+1 −1 openthread
+21 −5 src/nrf52811/openthread-core-nrf52811-config.h
+21 −5 src/nrf52833/openthread-core-nrf52833-config.h
+2 −2 src/nrf52833/transport-config.h
+21 −5 src/nrf52840/openthread-core-nrf52840-config.h
+2 −2 src/nrf52840/transport-config.h
+4 −1 src/src/transport/uart.c
+2 −2 third_party/NordicSemiconductor/config/app_config.h
2 changes: 1 addition & 1 deletion script/bootstrap.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ IMAGE_NAME=$(basename "${IMAGE_URL}" .zip)
IMAGE_FILE="$IMAGE_NAME".img
[ -f "$TOOLS_HOME"/images/"$IMAGE_FILE" ] || {
# unit MB
EXPAND_SIZE=4096
EXPAND_SIZE=6144

[ -d "$TOOLS_HOME"/images ] || mkdir -p "$TOOLS_HOME"/images

Expand Down
2 changes: 1 addition & 1 deletion script/make-firmware.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ build_ncs()

cd nrf
for variant in "${variants[@]}"; do
west build -d "${!variant:0:1}" -b nrf52840dongle_nrf52840 -p always "${!variant:1:1}" -- -DOVERLAY_CONFIG="${!variant:2:1}" -DDTC_OVERLAY_FILE=usb.overlay
west build -d "${!variant:0:1}" -b nrf52840dongle_nrf52840 -p always "${!variant:1:1}" -- -DOVERLAY_CONFIG="${!variant:2:1}"
done

package_ncs "ot-cli-ftd" "1.1"
Expand Down
6 changes: 5 additions & 1 deletion script/otbr-setup.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,11 @@ if [ "${REFERENCE_PLATFORM?}" = "ncs" ]; then
echo 'exit 0' >>/etc/rc.local

# update testharness-discovery script to fix autodiscovery issue
sed -i 's/OpenThread_BR/OTNCS_BR/g' /usr/sbin/testharness-discovery
if [ "$REFERENCE_RELEASE_TYPE" = "1.2" ]; then
sed -i 's/OpenThread_BR/OTNCS_BR/g' /usr/sbin/testharness-discovery
else
sed -i 's/OpenThread_BR/OTNCS13_BR/g' /usr/sbin/testharness-discovery
fi

elif [ "${REFERENCE_PLATFORM?}" = "efr32mg12" ]; then
# update testharness-discovery script to fix autodiscovery issue
Expand Down