From a05fdd9c1030eba1716dbc48e6911c4636bb84f9 Mon Sep 17 00:00:00 2001
From: qiyuexia <qiyuexia@espressif.com>
Date: Tue, 8 Jan 2019 22:14:36 +0800
Subject: [PATCH] mesh: update libs

1. detect and fix root conflicts when router BSSID is not set.
2. when root can not connect to the router due to NO_MORE_STAS(reason code:5), root will stop re-connection and perform MESH_NWK_LOOK_FOR_NETWORK.
3. wifi: fix the disconnection caused by receiving a deauth frame from non-parent node during scanning.
4. fix routing table redundant issue.
5. modify the max routes limitation from 300 to 1000.
6. wifi: fix ap does not deauth sta which has not completed the 4-way handshake.
---
 components/esp32/include/esp_mesh.h                         | 5 +++--
 components/esp32/lib                                        | 2 +-
 components/esp32/wifi_init.c                                | 1 +
 examples/mesh/internal_communication/main/Kconfig.projbuild | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/components/esp32/include/esp_mesh.h b/components/esp32/include/esp_mesh.h
index 8f8d03794..a53211756 100644
--- a/components/esp32/include/esp_mesh.h
+++ b/components/esp32/include/esp_mesh.h
@@ -1044,9 +1044,10 @@ esp_err_t esp_mesh_set_vote_percentage(float percentage);
 float esp_mesh_get_vote_percentage(void);
 
 /**
- * @brief      Set mesh softAP associate expired time
+ * @brief      Set mesh softAP associate expired time (default:10 seconds)
  *             - If mesh softAP hasn't received any data from an associated child within this time,
  *             mesh softAP will take this child inactive and disassociate it.
+ *             - If mesh softAP is encrypted, this value should be set a greater value, such as 30 seconds.
  *
  * @param[in]  seconds  the expired time
  *
@@ -1227,7 +1228,7 @@ esp_err_t esp_mesh_get_group_list(mesh_addr_t *addr, int num);
 bool esp_mesh_is_my_group(const mesh_addr_t *addr);
 
 /**
- * @brief      Set mesh network capacity
+ * @brief      Set mesh network capacity (max:1000, default:300)
  *
  * @attention  This API shall be called before mesh is started.
  *
diff --git a/components/esp32/lib b/components/esp32/lib
index 4123071ff..630ff8281 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit 4123071ff5e730cfed699f853a81359008607314
+Subproject commit 630ff8281b5babb5ba67dffdc6139bdbc4c58f92
diff --git a/components/esp32/wifi_init.c b/components/esp32/wifi_init.c
index ed539b625..2b3dae6b0 100644
--- a/components/esp32/wifi_init.c
+++ b/components/esp32/wifi_init.c
@@ -34,6 +34,7 @@ static void __attribute__((constructor)) s_set_default_wifi_log_level()
        the user to set the level again before esp_wifi_init() is called.
     */
     esp_log_level_set("wifi", CONFIG_LOG_DEFAULT_LEVEL);
+    esp_log_level_set("mesh", CONFIG_LOG_DEFAULT_LEVEL);
 }
 
 static void esp_wifi_set_debug_log()
diff --git a/examples/mesh/internal_communication/main/Kconfig.projbuild b/examples/mesh/internal_communication/main/Kconfig.projbuild
index e7f46ada3..50b649d93 100644
--- a/examples/mesh/internal_communication/main/Kconfig.projbuild
+++ b/examples/mesh/internal_communication/main/Kconfig.projbuild
@@ -59,7 +59,7 @@ config MESH_AP_CONNECTIONS
 
 config MESH_MAX_LAYER
     int "Mesh Max Layer"
-        range 1 15
+        range 1 25
         default 6
         help
             Max layer allowed in mesh network.