Просмотр исходного кода

Merge branch 'mesh/bugfix_1023_backport_v4.0' into 'release/v4.0'

esp_wifi_mesh: update wifi mesh libs(Backport v4.0)

See merge request espressif/esp-idf!11083
Jiang Jiang Jian 5 лет назад
Родитель
Сommit
b0ffa66039

+ 10 - 0
components/esp_wifi/include/esp_mesh_internal.h

@@ -263,6 +263,16 @@ esp_err_t esp_mesh_set_announce_interval(int short_ms, int long_ms);
  */
 esp_err_t esp_mesh_get_announce_interval(int *short_ms, int *long_ms);
 
+/**
+ * @brief      Enable mesh print scan result
+ *
+ * @param[in]  enable  enable or not
+ *
+ * @return
+ *    - ESP_OK
+ */
+esp_err_t esp_mesh_print_scan_result(bool enable);
+
 #ifdef __cplusplus
 }
 #endif

+ 1 - 1
components/esp_wifi/lib_esp32

@@ -1 +1 @@
-Subproject commit 40e538b6ad06387e753c75c1acd4b57b5faf7166
+Subproject commit 96f30622f9f5ff35470bcd61ffa697f8f32ac144

+ 9 - 0
components/esp_wifi/src/lib_printf.c

@@ -137,3 +137,12 @@ int coexist_printf(const char* format, ...)
     va_end(arg);
     return res;
 }
+
+int mesh_printf(const char* format, ...)
+{
+    va_list arg;
+    va_start(arg, format);
+    int res = lib_printf("mesh", format, arg);
+    va_end(arg);
+    return res;
+}