alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'mesh/bugfix_fix_heap_corrupt_issue_v4.2' into 'release/v4.2'

Browse Source 
esp_wifi: fix bugs in wifi mesh (backport v4.2)

See merge request espressif/esp-idf!23131
This commit is contained in:
Jiang Jiang Jian 2023-04-11 17:42:01 +08:00
commit 148f4c62a9
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_wifi/include/esp_mesh.h
View File

@ -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.
*

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit f4c1c87e6917ef759d9cd77ef174e06ed2abe5d2
Subproject commit 40cc0a3bc78b15a38ac82a662f1cbfbd50dc37d4

2
docs/en/api-reference/network/esp_now.rst
View File

@ -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.

2
docs/zh_CN/api-reference/network/esp_now.rst
View File

@ -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 地址的前三个字节。