mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'mesh/bugfix_fix_bugs_for_mesh_network_v4.4' into 'release/v4.4' 

wifi_mesh: fix bugs for mesh network (backport v4.4)

See merge request espressif/esp-idf!22899
pull/11147/head
Jiang Jiang Jian 2023-03-24 10:58:36 +08:00
rodzic 2222ca49d6 794905b0e1
commit 90d6e45d9f
2 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
components/esp_wifi/include/esp_mesh.h
Wyświetl plik

@ -188,7 +188,8 @@ typedef enum {
MESH_EVENT_PARENT_DISCONNECTED, /**< parent is disconnected on station interface */ MESH_EVENT_PARENT_DISCONNECTED, /**< parent is disconnected on station interface */
MESH_EVENT_NO_PARENT_FOUND, /**< no parent found */ MESH_EVENT_NO_PARENT_FOUND, /**< no parent found */
MESH_EVENT_LAYER_CHANGE, /**< layer changes over the mesh network */ 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_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_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. */ 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); 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. * @attention This API shall be called before mesh is started.
* *

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 9f94887228d3e09b2715a25f1d06c0a31f1c1903 Subproject commit 15b1309726f600122b5d4539e73758ae1852168d