Merge branch 'mesh/bugfix_0628_master' into 'master'

mesh: bugfix

Closes WIFI-628, WIFI-638, WIFI-635, WIFI-582, WIFI-130, WIFI-622, WIFI-579, WIFI-428, and WIFI-451

See merge request espressif/esp-idf!5437
This commit is contained in:
Jiang Jiang Jian 2019-07-05 20:48:03 +08:00
commit c849f7bfb6
2 changed files with 8 additions and 1 deletions

View file

@ -1479,6 +1479,13 @@ esp_err_t esp_mesh_switch_channel(const uint8_t *new_bssid, int csa_newchan, int
*/ */
esp_err_t esp_mesh_get_router_bssid(uint8_t *router_bssid); esp_err_t esp_mesh_get_router_bssid(uint8_t *router_bssid);
/**
* @brief Get the TSF time
*
* @return the TSF time
*/
int64_t esp_mesh_get_tsf_time(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

@ -1 +1 @@
Subproject commit 7657dd453d4349d03458b77c082acbfe6b6736c4 Subproject commit b7bfeeccdb63fd20cf6b4abc52d9185934af4cb8