espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport/fix_matter_commissioning_ble_disconnect_issue' into 'release/v5.1'

Browse Source 
openthread: Add some backports related to openthread(Backport v5.1)

See merge request espressif/esp-idf!23893
This commit is contained in:
Jiang Jiang Jian
2023-05-26 15:37:14 +08:00
parent 125d00c0f7 7eb9af5806
commit ea5e0ff298
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_phy/lib

Submodule components/esp_phy/lib updated: d39766d34e...89f0a98c97

7
components/openthread/Kconfig
View File

@ -201,6 +201,13 @@ menu "OpenThread"
help
Select this option to enable link metrics feature
config OPENTHREAD_MACFILTER_ENABLE
bool "Enable mac filter feature"
depends on OPENTHREAD_ENABLED
default n
help
Select this option to enable mac filter feature
config OPENTHREAD_CSL_ENABLE
bool "Enable CSL feature"
depends on OPENTHREAD_ENABLED

4
components/openthread/port/esp_openthread_radio.c
View File

@ -300,7 +300,9 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
aFrame->mPsdu[-1] = aFrame->mLength; // lenth locates one byte before the psdu (esp_openthread_radio_tx_psdu);
if (otMacFrameIsSecurityEnabled(aFrame) && !aFrame->mInfo.mTxInfo.mIsSecurityProcessed) {
otMacFrameSetFrameCounter(aFrame, s_mac_frame_counter++);
if (!s_transmit_frame.mInfo.mTxInfo.mIsARetx) {
otMacFrameSetFrameCounter(aFrame, s_mac_frame_counter++);
}
if (otMacFrameIsKeyIdMode1(aFrame)) {
s_transmit_frame.mInfo.mTxInfo.mAesKey = &s_current_key;
if (!s_transmit_frame.mInfo.mTxInfo.mIsARetx) {

4
components/openthread/private_include/openthread-core-esp32x-ftd-config.h
View File

@ -408,6 +408,10 @@
#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 1
#endif
#if CONFIG_OPENTHREAD_MACFILTER_ENABLE
#define OPENTHREAD_CONFIG_MAC_FILTER_ENABLE 1
#endif
#if CONFIG_OPENTHREAD_JOINER
#define OPENTHREAD_CONFIG_JOINER_ENABLE 1
#endif

4
components/openthread/private_include/openthread-core-esp32x-mtd-config.h
View File

@ -212,6 +212,10 @@
#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0
#endif
#if CONFIG_OPENTHREAD_MACFILTER_ENABLE
#define OPENTHREAD_CONFIG_MAC_FILTER_ENABLE 1
#endif // CONFIG_OPENTHREAD_MACFILTER_ENABLE
#if CONFIG_OPENTHREAD_JOINER
#define OPENTHREAD_CONFIG_JOINER_ENABLE 0
#endif