From a42b845cab1bc56a017ee33e32aa34a70a9ebd16 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Mon, 10 Apr 2023 17:20:59 +0800 Subject: [PATCH 1/3] esp_wifi: 1. wifi_mesh: fix the heap corrupt issue in MTXON task 2. wifi_mesh: Fix several bugs on mesh network --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index f4c1c87e69..40cc0a3bc7 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit f4c1c87e6917ef759d9cd77ef174e06ed2abe5d2 +Subproject commit 40cc0a3bc78b15a38ac82a662f1cbfbd50dc37d4 From a7ba067c2e9171dc44cf8cdeb4256f7da8de9a19 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Wed, 22 Mar 2023 16:32:43 +0800 Subject: [PATCH 2/3] wifi_mesh: update mesh doc --- components/esp_wifi/include/esp_mesh.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/include/esp_mesh.h b/components/esp_wifi/include/esp_mesh.h index 5e528610e9..33f162d91c 100644 --- a/components/esp_wifi/include/esp_mesh.h +++ b/components/esp_wifi/include/esp_mesh.h @@ -188,7 +188,8 @@ typedef enum { MESH_EVENT_PARENT_DISCONNECTED, /**< parent is disconnected on station interface */ MESH_EVENT_NO_PARENT_FOUND, /**< no parent found */ MESH_EVENT_LAYER_CHANGE, /**< layer changes over the mesh network */ - MESH_EVENT_TODS_STATE, /**< state represents whether the root is able to access external IP network */ + MESH_EVENT_TODS_STATE, /**< state represents whether the root is able to access external IP network. + This state is a manual event that needs to be triggered with esp_mesh_post_toDS_state(). */ MESH_EVENT_VOTE_STARTED, /**< the process of voting a new root is started either by children or by the root */ MESH_EVENT_VOTE_STOPPED, /**< the process of voting a new root is stopped */ MESH_EVENT_ROOT_ADDRESS, /**< the root address is obtained. It is posted by mesh stack automatically. */ @@ -1189,7 +1190,10 @@ esp_err_t esp_mesh_get_rx_pending(mesh_rx_pending_t *pending); int esp_mesh_available_txupQ_num(const mesh_addr_t *addr, uint32_t *xseqno_in); /** - * @brief Set the number of queue + * @brief Set the number of RX queue for the node, the average number of window allocated to one of + * its child node is: wnd = xon_qsize / (2 * max_connection + 1). + * However, the window of each child node is not strictly equal to the average value, + * it is affected by the traffic also. * * @attention This API shall be called before mesh is started. * From 504e83c856e91541a35494cae446a7b98fff5704 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Thu, 6 Apr 2023 18:10:55 +0800 Subject: [PATCH 3/3] Update the ESP-NOW frame length in docs --- docs/en/api-reference/network/esp_now.rst | 2 +- docs/zh_CN/api-reference/network/esp_now.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/api-reference/network/esp_now.rst b/docs/en/api-reference/network/esp_now.rst index 89bb93e42b..55198bc83f 100644 --- a/docs/en/api-reference/network/esp_now.rst +++ b/docs/en/api-reference/network/esp_now.rst @@ -21,7 +21,7 @@ ESP-NOW uses a vendor-specific action frame to transmit ESP-NOW data. The defaul ------------------------------------------------------------------------------------------------------------ | MAC Header | Category Code | Organization Identifier | Random Values | Vendor Specific Content | FCS | ------------------------------------------------------------------------------------------------------------ - 24 bytes 1 byte 3 bytes 4 bytes 7~255 bytes 4 bytes + 24 bytes 1 byte 3 bytes 4 bytes 7~257 bytes 4 bytes - Category Code: The Category Code field is set to the value(127) indicating the vendor-specific category. - Organization Identifier: The Organization Identifier contains a unique identifier (0x18fe34), which is the first three bytes of MAC address applied by Espressif. diff --git a/docs/zh_CN/api-reference/network/esp_now.rst b/docs/zh_CN/api-reference/network/esp_now.rst index 98a46121be..9583292d27 100644 --- a/docs/zh_CN/api-reference/network/esp_now.rst +++ b/docs/zh_CN/api-reference/network/esp_now.rst @@ -21,7 +21,7 @@ ESP-NOW 使用各个供应商的动作帧传输数据，默认比特率为 1 Mbp ----------------------------------------------------------------------------------------- | MAC 报头 | 分类代码 | 组织标识符 | 随机值 | 供应商特定内容 | FCS | ----------------------------------------------------------------------------------------- - 24 字节 1 字节 3 字节 4 字节 7~255 字节 4 字节 + 24 字节 1 字节 3 字节 4 字节 7~257 字节 4 字节 - 分类代码：分类代码字段可用于指示各个供应商的类别（比如 127）。 - 组织标识符：组织标识符包含一个唯一标识符 (比如 0x18fe34)，为乐鑫指定的 MAC 地址的前三个字节。