diff --git a/etc/cmake/options.cmake b/etc/cmake/options.cmake index 9c39b89cb..f16694652 100644 --- a/etc/cmake/options.cmake +++ b/etc/cmake/options.cmake @@ -287,7 +287,7 @@ endif() # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - set(OT_THREAD_VERSION_VALUES "1.1" "1.2" "1.3" "1.3.1" "1.4") -set(OT_THREAD_VERSION "1.3" CACHE STRING "set Thread version") +set(OT_THREAD_VERSION "1.4" CACHE STRING "set Thread version") set_property(CACHE OT_THREAD_VERSION PROPERTY STRINGS "${OT_THREAD_VERSION_VALUES}") list(FIND OT_THREAD_VERSION_VALUES "${OT_THREAD_VERSION}" ot_index) if(ot_index EQUAL -1) diff --git a/examples/config/ot-core-config-check-size-br.h b/examples/config/ot-core-config-check-size-br.h index d8b2b130e..b8bf96fea 100644 --- a/examples/config/ot-core-config-check-size-br.h +++ b/examples/config/ot-core-config-check-size-br.h @@ -35,7 +35,7 @@ #ifndef OT_CORE_CONFIG_CHECK_SIZE_BR_H_ #define OT_CORE_CONFIG_CHECK_SIZE_BR_H_ -#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3 +#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4 #define OPENTHREAD_CONFIG_ASSERT_ENABLE 1 #define OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE 1 diff --git a/examples/config/ot-core-config-check-size-ftd.h b/examples/config/ot-core-config-check-size-ftd.h index bdd69d055..3cda3271b 100644 --- a/examples/config/ot-core-config-check-size-ftd.h +++ b/examples/config/ot-core-config-check-size-ftd.h @@ -35,7 +35,7 @@ #ifndef OT_CORE_CONFIG_CHECK_SIZE_FTD_H_ #define OT_CORE_CONFIG_CHECK_SIZE_FTD_H_ -#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3 +#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4 #define OPENTHREAD_CONFIG_ASSERT_ENABLE 1 #define OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE 0 diff --git a/examples/config/ot-core-config-check-size-mtd.h b/examples/config/ot-core-config-check-size-mtd.h index d5ca74cbc..310cfce9d 100644 --- a/examples/config/ot-core-config-check-size-mtd.h +++ b/examples/config/ot-core-config-check-size-mtd.h @@ -35,7 +35,7 @@ #ifndef OT_CORE_CONFIG_CHECK_SIZE_MTD_H_ #define OT_CORE_CONFIG_CHECK_SIZE_MTD_H_ -#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_3 +#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4 #define OPENTHREAD_CONFIG_ASSERT_ENABLE 1 #define OPENTHREAD_CONFIG_BACKBONE_ROUTER_ENABLE 0 diff --git a/script/cmake-build b/script/cmake-build index f8e227c5d..2756d3d44 100755 --- a/script/cmake-build +++ b/script/cmake-build @@ -72,7 +72,9 @@ readonly OT_PLATFORMS OT_POSIX_SIM_COMMON_OPTIONS=( "-DOT_ANYCAST_LOCATOR=ON" + "-DOT_BLE_TCAT=ON" "-DOT_BORDER_AGENT=ON" + "-DOT_BORDER_AGENT_EPSKC=ON" "-DOT_BORDER_AGENT_ID=ON" "-DOT_BORDER_ROUTER=ON" "-DOT_CHANNEL_MANAGER=ON" @@ -109,7 +111,6 @@ OT_POSIX_SIM_COMMON_OPTIONS=( "-DOT_SRP_CLIENT=ON" "-DOT_SRP_SERVER=ON" "-DOT_UPTIME=ON" - "-DOT_BLE_TCAT=ON" ) readonly OT_POSIX_SIM_COMMON_OPTIONS diff --git a/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py b/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py index 2b522d44c..03b6add98 100755 --- a/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py +++ b/tests/scripts/thread-cert/border_router/test_publish_meshcop_service.py @@ -233,7 +233,7 @@ def check_meshcop_service_by_data(self, br, service_data): self.assertEqual(bool(state_bitmap >> 11 & 1), br.ephemeral_key_enabled) # ePSKc is supported or not self.assertEqual(service_data['txt']['nn'], br.get_network_name()) self.assertEqual(service_data['txt']['rv'], '1') - self.assertIn(service_data['txt']['tv'], ['1.1.0', '1.1.1', '1.2.0', '1.3.0']) + self.assertIn(service_data['txt']['tv'], ['1.1.0', '1.1.1', '1.2.0', '1.3.0', '1.4.0']) def discover_services(self, host, type): instance_names = host.browse_mdns_services(type)