From c5a52c605f4e957120a856859eacce3b8b00e995 Mon Sep 17 00:00:00 2001 From: WangQixiang Date: Fri, 10 Sep 2021 14:15:52 +0800 Subject: [PATCH 1/2] openthread: update openthread submodule openthread: add srp client enable option for openthread component ieee802154: set ieee802154 default PTI to 6 --- components/esp_phy/lib | 2 +- components/ieee802154/lib | 2 +- components/openthread/Kconfig | 8 ++++++++ components/openthread/lib | 2 +- components/openthread/openthread | 2 +- .../openthread-core-esp32x-ftd-config.h | 20 +++++++++++++++++++ 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/components/esp_phy/lib b/components/esp_phy/lib index 1174878441..0ae4bb88c0 160000 --- a/components/esp_phy/lib +++ b/components/esp_phy/lib @@ -1 +1 @@ -Subproject commit 1174878441c77b467503b1b7a1b24e00bea2839e +Subproject commit 0ae4bb88c00faa641be5d2a613184735f484edb8 diff --git a/components/ieee802154/lib b/components/ieee802154/lib index d7d5f59259..9f5363e97a 160000 --- a/components/ieee802154/lib +++ b/components/ieee802154/lib @@ -1 +1 @@ -Subproject commit d7d5f592598457098e350fb2aa3670ebbe8056a3 +Subproject commit 9f5363e97ae6d53d62f1ef90edf2717fb72e47a8 diff --git a/components/openthread/Kconfig b/components/openthread/Kconfig index cdee2a0222..ab63e14185 100644 --- a/components/openthread/Kconfig +++ b/components/openthread/Kconfig @@ -77,6 +77,14 @@ menu "OpenThread" Select this option to enable Joiner in OpenThread. This allows a device to join the Thread network with a pre-shared key using the Thread commissioning protocol. + config OPENTHREAD_SRP_CLIENT + bool "Enable SRP Client" + depends on OPENTHREAD_ENABLED + default n + help + Select this option to enable SRP Client in OpenThread. This allows a device to register SRP services to SRP + Server. + config OPENTHREAD_BORDER_ROUTER bool "Enable Border Router" depends on OPENTHREAD_ENABLED diff --git a/components/openthread/lib b/components/openthread/lib index 1f6e937b50..6cb8a43666 160000 --- a/components/openthread/lib +++ b/components/openthread/lib @@ -1 +1 @@ -Subproject commit 1f6e937b5035291645265e0fe31fd587cc1f88c0 +Subproject commit 6cb8a436669f3a0f7e967625141c94930e3cb8bc diff --git a/components/openthread/openthread b/components/openthread/openthread index a662c32eb0..71bc37bbc3 160000 --- a/components/openthread/openthread +++ b/components/openthread/openthread @@ -1 +1 @@ -Subproject commit a662c32eb074cc624bf344f810f65f8637a89552 +Subproject commit 71bc37bbc353b0ca1775f5654a2b65fcbe044650 diff --git a/components/openthread/private_include/openthread-core-esp32x-ftd-config.h b/components/openthread/private_include/openthread-core-esp32x-ftd-config.h index 6e605de981..6f0dd0fbbd 100644 --- a/components/openthread/private_include/openthread-core-esp32x-ftd-config.h +++ b/components/openthread/private_include/openthread-core-esp32x-ftd-config.h @@ -126,6 +126,16 @@ #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 #endif +/** + * @def OPENTHREAD_CONFIG_TCP_ENABLE + * + * Define to 0 to disable TCP + * + */ +#ifndef OPENTHREAD_CONFIG_TCP_ENABLE +#define OPENTHREAD_CONFIG_TCP_ENABLE 0 +#endif + #if CONFIG_OPENTHREAD_BORDER_ROUTER /** @@ -375,6 +385,16 @@ #define OPENTHREAD_CONFIG_DIAG_ENABLE 1 #endif +#if CONFIG_OPENTHREAD_SRP_CLIENT +#ifndef OPENTHREAD_CONFIG_ECDSA_ENABLE +#define OPENTHREAD_CONFIG_ECDSA_ENABLE 1 +#endif + +#ifndef OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE +#define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1 +#endif +#endif + #if CONFIG_OPENTHREAD_FTD #define OPENTHREAD_FTD 1 #elif CONFIG_OPENTHREAD_MTD From 988ec8be560e3fa527945e201d3a08ecd3e3d99f Mon Sep 17 00:00:00 2001 From: xiaqilin Date: Tue, 14 Sep 2021 13:24:30 +0800 Subject: [PATCH 2/2] ieee802154: add zigbee pending mode and config coordinator function --- components/ieee802154/include/esp_ieee802154.h | 18 ++++++++++++++++++ .../ieee802154/include/esp_ieee802154_types.h | 1 + 2 files changed, 19 insertions(+) diff --git a/components/ieee802154/include/esp_ieee802154.h b/components/ieee802154/include/esp_ieee802154.h index a8d4678e92..e31a5ca37e 100644 --- a/components/ieee802154/include/esp_ieee802154.h +++ b/components/ieee802154/include/esp_ieee802154.h @@ -192,6 +192,24 @@ void esp_ieee802154_get_extended_address(uint8_t *ext_addr); */ void esp_ieee802154_set_extended_address(const uint8_t *ext_addr); +/** + * @brief Get the device coordinator. + * + * @return + * - True The coordinator is enabled. + * - False The coordinator is disabled. + * + */ +bool esp_ieee802154_get_coordinator(void); + +/** + * @brief Set the device coordinator role. + * + * @param[in] enable The coordinator role to be set. + * + */ +void esp_ieee802154_set_coordinator(bool enable); + /** * @brief Get the auto frame pending mode. * diff --git a/components/ieee802154/include/esp_ieee802154_types.h b/components/ieee802154/include/esp_ieee802154_types.h index 1407563171..823e3cdcf3 100644 --- a/components/ieee802154/include/esp_ieee802154_types.h +++ b/components/ieee802154/include/esp_ieee802154_types.h @@ -62,6 +62,7 @@ typedef enum { ESP_IEEE802154_AUTO_PENDING_DISABLE, /*!< Frame pending bit always set to 1 in the ack to Data Request */ ESP_IEEE802154_AUTO_PENDING_ENABLE, /*!< Frame pending bit set to 1 if src address matches, in the ack to Data Request */ ESP_IEEE802154_AUTO_PENDING_ENHANCED, /*!< Frame pending bit set to 1 if src address matches, in all ack frames */ + ESP_IEEE802154_AUTO_PENDING_ZIGBEE, /*!< Frame pending bit set to 0 only if src address is short address and matches in table, in the ack to Data Request */ } esp_ieee802154_pending_mode_t; /**