espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

openthread: update openthread submodule

Browse Source 
Roll OpenThread submodule and rename OpenThread config macros and api
calls accordingly.
This commit is contained in:
Jiacheng Guo
2021-04-16 14:39:21 +08:00
parent f8addc5b3d
commit 64c498a584
6 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/openthread/CMakeLists.txt
View File

@@ -10,11 +10,14 @@ if(CONFIG_OPENTHREAD_ENABLED)
"openthread/src/lib/hdlc" "openthread/src/lib/hdlc"
"openthread/src/lib/spinel" "openthread/src/lib/spinel"
"openthread/src/ncp" "openthread/src/ncp"
"openthread/examples/platforms/"
"private_include") "private_include")
set(src_dirs set(src_dirs
"openthread/examples/apps/cli"
"openthread/src/cli" "openthread/src/cli"
"openthread/src/core/api" "openthread/src/core/api"
"openthread/src/core/backbone_router"
"openthread/src/core/coap" "openthread/src/core/coap"
"openthread/src/core/common" "openthread/src/core/common"
"openthread/src/core/crypto" "openthread/src/core/crypto"
@@ -30,7 +33,9 @@ if(CONFIG_OPENTHREAD_ENABLED)
"openthread/src/lib/spinel" "openthread/src/lib/spinel"
"port") "port")
set(exclude_srcs "openthread/src/core/common/extension_example.cpp") set(exclude_srcs
"openthread/examples/apps/cli/main.cpp"
"openthread/src/core/common/extension_example.cpp")
if(CONFIG_OPENTHREAD_FTD) if(CONFIG_OPENTHREAD_FTD)
set(device_type "OPENTHREAD_FTD=1") set(device_type "OPENTHREAD_FTD=1")

50
components/openthread/component.mk
View File

@@ -5,6 +5,7 @@ COMPONENT_ADD_INCLUDEDIRS := \
include include
COMPONENT_PRIV_INCLUDEDIRS := \ COMPONENT_PRIV_INCLUDEDIRS := \
openthread/examples/platforms \
openthread/src \ openthread/src \
openthread/src/core \ openthread/src/core \
openthread/src/lib/hdlc \ openthread/src/lib/hdlc \
@@ -12,27 +13,30 @@ COMPONENT_PRIV_INCLUDEDIRS := \
openthread/src/ncp \ openthread/src/ncp \
private_include private_include
COMPONENT_SRCDIRS := \ COMPONENT_SRCDIRS := \
openthread/src/cli \ openthread/examples/apps/cli \
openthread/src/core \ openthread/src/cli \
openthread/src/core/api \ openthread/src/core \
openthread/src/core/coap \ openthread/src/core/api \
openthread/src/core/common \ openthread/src/core/backbone_router \
openthread/src/core/crypto \ openthread/src/core/coap \
openthread/src/core/diags \ openthread/src/core/common \
openthread/src/core/mac \ openthread/src/core/crypto \
openthread/src/core/meshcop \ openthread/src/core/diags \
openthread/src/core/net \ openthread/src/core/mac \
openthread/src/core/radio \ openthread/src/core/meshcop \
openthread/src/core/thread \ openthread/src/core/net \
openthread/src/core/utils \ openthread/src/core/radio \
openthread/src/lib/hdlc \ openthread/src/core/thread \
openthread/src/lib/platform \ openthread/src/core/utils \
openthread/src/lib/spinel \ openthread/src/lib/hdlc \
openthread/src/lib/platform \
openthread/src/lib/spinel \
port port
COMPONENT_OBJEXCLUDE := \ COMPONENT_OBJEXCLUDE := \
openthread/src/core/common/extension_example.o openthread/examples/apps/cli/main.o \
openthread/src/core/common/extension_example.o \
IDF_VERSION_FOR_OPENTHREAD_PACKAGE := $(shell git -C $(COMPONENT_PATH) rev-parse --short HEAD) IDF_VERSION_FOR_OPENTHREAD_PACKAGE := $(shell git -C $(COMPONENT_PATH) rev-parse --short HEAD)
OPENTHREAD_VERSION := $(shell git -C $(COMPONENT_PATH)/openthread rev-parse --short HEAD) OPENTHREAD_VERSION := $(shell git -C $(COMPONENT_PATH)/openthread rev-parse --short HEAD)
@@ -40,14 +44,14 @@ OPENTHREAD_PACKAGE_VERSION := $(IDF_VERSION_FOR_OPENTHREAD_PACKAGE)-$(OPENTHREAD
COMMON_FLAGS := \ COMMON_FLAGS := \
-DOPENTHREAD_CONFIG_FILE=\<openthread-core-esp32x-config.h\> \ -DOPENTHREAD_CONFIG_FILE=\<openthread-core-esp32x-config.h\> \
-DPACKAGE_VERSION=\"OPENTHREAD_PACKAGE_VERSION\" -DPACKAGE_VERSION=\"OPENTHREAD_PACKAGE_VERSION\"
ifdef CONFIG_OPENTHREAD_FTD ifdef CONFIG_OPENTHREAD_FTD
COMMON_FLAGS += -DOPENTHREAD_FTD=1 COMMON_FLAGS += -DOPENTHREAD_FTD=1
else ifdef CONFIG_OPENTHREAD_MTD else ifdef CONFIG_OPENTHREAD_MTD
COMMON_FLAGS += -DOPENTHREAD_MTD=1 COMMON_FLAGS += -DOPENTHREAD_MTD=1
else ifdef CONFIG_OPENTHREAD_RADIO else ifdef CONFIG_OPENTHREAD_RADIO
COMMON_FLAGS += -DOPENTHREAD_RADIO=1 COMMON_FLAGS += -DOPENTHREAD_RADIO=1
endif endif
CFLAGS += $(COMMON_FLAGS) CFLAGS += $(COMMON_FLAGS)

6
components/openthread/include/openthread-core-esp32x-config.h
View File

@@ -180,12 +180,12 @@
#define OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER 0 #define OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER 0
/** /**
* @def OPENTHREAD_CONFIG_NCP_UART_ENABLE * @def OPENTHREAD_CONFIG_NCP_HDLC_ENABLE
* *
* Define to 1 to enable NCP UART support. * Define to 1 to enable NCP HDLC support.
* *
*/ */
#define OPENTHREAD_CONFIG_NCP_UART_ENABLE 1 #define OPENTHREAD_CONFIG_NCP_HDLC_ENABLE 1
/** /**
* @def OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE * @def OPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE

2
components/openthread/openthread

Submodule components/openthread/openthread updated: 93b6fea3aa...23bbde5c96

2
components/openthread/port/esp_openthread_uart.c
View File

@@ -27,7 +27,7 @@
#include "esp_vfs_dev.h" #include "esp_vfs_dev.h"
#include "common/logging.hpp" #include "common/logging.hpp"
#include "driver/uart.h" #include "driver/uart.h"
#include "openthread/platform/uart.h" #include "utils/uart.h"
static int s_uart_port; static int s_uart_port;
static int s_uart_fd; static int s_uart_fd;

4
examples/openthread/ot_cli/main/ot_esp_cli.c
View File

@@ -33,6 +33,8 @@
#define TAG "ot_esp_cli" #define TAG "ot_esp_cli"
extern void otAppCliInit(otInstance *instance);
static void ot_task_worker(void *aContext) static void ot_task_worker(void *aContext)
{ {
esp_openthread_platform_config_t config = { esp_openthread_platform_config_t config = {
@@ -84,7 +86,7 @@ static void ot_task_worker(void *aContext)
assert(instance != NULL); assert(instance != NULL);
esp_openthread_lock_acquire(portMAX_DELAY); esp_openthread_lock_acquire(portMAX_DELAY);
otCliUartInit(instance); otAppCliInit(instance);
esp_openthread_lock_release(); esp_openthread_lock_release();
while (true) { while (true) {