espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mesh/bugfix_v3.2_backport' into 'release/v3.2'

Browse Source 
mesh: bugfix (backport3.2)

See merge request idf/esp-idf!3771
This commit is contained in:
Jiang Jiang Jian
2018-11-22 10:22:12 +08:00
parent d57ea422be 802d94aa35
commit a0f516de0b
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/esp32/include/esp_mesh.h
View File

@ -186,6 +186,7 @@ typedef enum {
MESH_EVENT_SCAN_DONE, /**< if self-organized networking is disabled, user can call esp_wifi_scan_start() to trigger MESH_EVENT_SCAN_DONE, /**< if self-organized networking is disabled, user can call esp_wifi_scan_start() to trigger
this event, and add the corresponding scan done handler in this event. */ this event, and add the corresponding scan done handler in this event. */
MESH_EVENT_NETWORK_STATE, /**< network state, such as whether current mesh network has a root. */ MESH_EVENT_NETWORK_STATE, /**< network state, such as whether current mesh network has a root. */
MESH_EVENT_STOP_RECONNECTION, /**< the root stops reconnecting to the router and non-root devices stop reconnecting to their parents. */
MESH_EVENT_MAX, MESH_EVENT_MAX,
} mesh_event_id_t; } mesh_event_id_t;
@ -941,9 +942,9 @@ bool esp_mesh_is_root(void);
* @attention This API is used to dynamically modify whether to enable the self organizing. * @attention This API is used to dynamically modify whether to enable the self organizing.
* *
* @param[in] enable enable or disable self-organized networking * @param[in] enable enable or disable self-organized networking
* @param[in] select_parent * @param[in] select_parent Only valid when self-organized networking is enabled.
* - If self-organized networking is enabled, let the device search for a new parent or * - if select_parent is set to true, the root will give up its mesh root status and search for a new parent
* keep connecting to the previous parent. * like other non-root devices.
* *
* @return * @return
* - ESP_OK * - ESP_OK
@ -1395,6 +1396,22 @@ esp_err_t esp_mesh_get_subnet_nodes_num(const mesh_addr_t *child_mac, int *nodes
*/ */
esp_err_t esp_mesh_get_subnet_nodes_list(const mesh_addr_t *child_mac, mesh_addr_t *nodes, int nodes_num); esp_err_t esp_mesh_get_subnet_nodes_list(const mesh_addr_t *child_mac, mesh_addr_t *nodes, int nodes_num);
/**
* @brief Disconnect from current parent
*
* @return
* - ESP_OK
*/
esp_err_t esp_mesh_disconnect(void);
/**
* @brief Connect to current parent
*
* @return
* - ESP_OK
*/
esp_err_t esp_mesh_connect(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
components/esp32/lib

Submodule components/esp32/lib updated: 93b9dba46f...f2e25be802

2
components/idf_test/include/idf_performance.h
View File

@ -20,7 +20,7 @@
#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA 15 #define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA 15
/* Due to code size & linker layout differences interacting with cache, VFS /* Due to code size & linker layout differences interacting with cache, VFS
microbenchmark currently runs slower with PSRAM enabled. */ microbenchmark currently runs slower with PSRAM enabled. */
#define IDF_PERFORMANCE_MAX_VFS_OPEN_WRITE_CLOSE_TIME 20000 #define IDF_PERFORMANCE_MAX_VFS_OPEN_WRITE_CLOSE_TIME 50000
#define IDF_PERFORMANCE_MAX_VFS_OPEN_WRITE_CLOSE_TIME_PSRAM 40000 #define IDF_PERFORMANCE_MAX_VFS_OPEN_WRITE_CLOSE_TIME_PSRAM 40000
// throughput performance by iperf // throughput performance by iperf
#define IDF_PERFORMANCE_MIN_TCP_RX_THROUGHPUT 50 #define IDF_PERFORMANCE_MIN_TCP_RX_THROUGHPUT 50