mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'feat/update_ot_jan2026_v5.4' into 'release/v5.4'
feat(openthread): update OT to 9b887f6bd (v5.4) See merge request espressif/esp-idf!46760
This commit is contained in:
Submodule components/openthread/lib updated: eb8f0378a2...1ac8672c63
Submodule components/openthread/openthread updated: a12ff0d0f5...b1a37932b1
@@ -899,7 +899,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @OPENTHREAD_CONFIG_DELAY_AWARE_QUEUE_MANAGEMENT_MARK_ECN_INTERVAL
|
* @def OPENTHREAD_CONFIG_DELAY_AWARE_QUEUE_MANAGEMENT_MARK_ECN_INTERVAL
|
||||||
*
|
*
|
||||||
* Specifies the time-in-queue threshold interval in milliseconds to mark ECN on a message if it is ECN-capable or
|
* Specifies the time-in-queue threshold interval in milliseconds to mark ECN on a message if it is ECN-capable or
|
||||||
* drop the message if not ECN-capable.
|
* drop the message if not ECN-capable.
|
||||||
@@ -908,6 +908,15 @@
|
|||||||
#define OPENTHREAD_CONFIG_DELAY_AWARE_QUEUE_MANAGEMENT_MARK_ECN_INTERVAL 1000
|
#define OPENTHREAD_CONFIG_DELAY_AWARE_QUEUE_MANAGEMENT_MARK_ECN_INTERVAL 1000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @def OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE
|
||||||
|
*
|
||||||
|
* Define as 1 to enable the MeshCoP Steering Data public APIs (in `openthread/steering_data.h`).
|
||||||
|
*/
|
||||||
|
#ifndef OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE
|
||||||
|
#define OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE 1
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef OPENTHREAD_CONFIG_THREAD_VERSION
|
#ifndef OPENTHREAD_CONFIG_THREAD_VERSION
|
||||||
#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4
|
#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -503,3 +503,16 @@
|
|||||||
#ifndef OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD
|
#ifndef OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD
|
||||||
#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD CONFIG_OPENTHREAD_PARENT_SEARCH_RSS_THRESHOLD
|
#define OPENTHREAD_CONFIG_PARENT_SEARCH_RSS_THRESHOLD CONFIG_OPENTHREAD_PARENT_SEARCH_RSS_THRESHOLD
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @def OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE
|
||||||
|
*
|
||||||
|
* Define as 1 to enable the MeshCoP Steering Data public APIs (in `openthread/steering_data.h`).
|
||||||
|
*/
|
||||||
|
#ifndef OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE
|
||||||
|
#define OPENTHREAD_CONFIG_MESHCOP_STEERING_DATA_API_ENABLE 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef OPENTHREAD_CONFIG_THREAD_VERSION
|
||||||
|
#define OPENTHREAD_CONFIG_THREAD_VERSION OT_THREAD_VERSION_1_4
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
|
|||||||
originator: 'Organization: Google LLC'
|
originator: 'Organization: Google LLC'
|
||||||
description: OpenThread released by Google is an open-source implementation of the Thread networking
|
description: OpenThread released by Google is an open-source implementation of the Thread networking
|
||||||
url: https://github.com/espressif/openthread
|
url: https://github.com/espressif/openthread
|
||||||
hash: a12ff0d0f54fd41954b45047fcdd08f302731c5f
|
hash: b1a37932b1830518f6fa6c92dfb4123a01ac3052
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2021-2026 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@@ -183,7 +183,21 @@ static esp_err_t openthread_netif_transmit(void *handle, void *buffer, size_t le
|
|||||||
otError ot_error = OT_ERROR_NONE;
|
otError ot_error = OT_ERROR_NONE;
|
||||||
|
|
||||||
esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
|
esp_openthread_task_switching_lock_acquire(portMAX_DELAY);
|
||||||
otMessage *message = otIp6NewMessage(esp_openthread_get_instance(), NULL);
|
|
||||||
|
otMessageSettings settings = {};
|
||||||
|
switch (otThreadGetDeviceRole(esp_openthread_get_instance()))
|
||||||
|
{
|
||||||
|
case OT_DEVICE_ROLE_DISABLED:
|
||||||
|
settings.mLinkSecurityEnabled = false;
|
||||||
|
settings.mPriority = OT_MESSAGE_PRIORITY_LOW;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
settings.mLinkSecurityEnabled = true;
|
||||||
|
settings.mPriority = OT_MESSAGE_PRIORITY_NORMAL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
otMessage *message = otIp6NewMessage(esp_openthread_get_instance(), &settings);
|
||||||
if (message == NULL) {
|
if (message == NULL) {
|
||||||
ESP_LOGE(OT_PLAT_LOG_TAG, "Failed to allocate OpenThread message");
|
ESP_LOGE(OT_PLAT_LOG_TAG, "Failed to allocate OpenThread message");
|
||||||
ExitNow(error = ESP_ERR_NO_MEM);
|
ExitNow(error = ESP_ERR_NO_MEM);
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
set(rcp_srcs
|
set(rcp_srcs
|
||||||
# OpenThread core - RADIO_COMMON_SOURCES from openthread/src/core/CMakeLists.txt
|
# OpenThread core - RADIO_COMMON_SOURCES from openthread/src/core/CMakeLists.txt
|
||||||
# No need for crypto/crypto_platform_mbedtls.cpp because we use esp-idf implementation
|
|
||||||
openthread/src/core/api/diags_api.cpp
|
openthread/src/core/api/diags_api.cpp
|
||||||
openthread/src/core/api/error_api.cpp
|
openthread/src/core/api/error_api.cpp
|
||||||
openthread/src/core/api/instance_api.cpp
|
openthread/src/core/api/instance_api.cpp
|
||||||
@@ -26,7 +25,7 @@ set(rcp_srcs
|
|||||||
openthread/src/core/common/uptime.cpp
|
openthread/src/core/common/uptime.cpp
|
||||||
openthread/src/core/crypto/aes_ccm.cpp
|
openthread/src/core/crypto/aes_ccm.cpp
|
||||||
openthread/src/core/crypto/aes_ecb.cpp
|
openthread/src/core/crypto/aes_ecb.cpp
|
||||||
openthread/src/core/crypto/crypto_platform.cpp
|
openthread/src/core/crypto/crypto_platform_mbedtls.cpp
|
||||||
openthread/src/core/crypto/storage.cpp
|
openthread/src/core/crypto/storage.cpp
|
||||||
openthread/src/core/diags/factory_diags.cpp
|
openthread/src/core/diags/factory_diags.cpp
|
||||||
openthread/src/core/instance/instance.cpp
|
openthread/src/core/instance/instance.cpp
|
||||||
|
|||||||
Reference in New Issue
Block a user