Merge branch 'bugfix/Eliminate_compilation_warnings' into 'master'

fix: esp_mesh_lite_try_sending_raw_msg has been deprecated, use esp_mesh_lite_send_msg

See merge request ae_group/esp-mesh-lite!157

Author: xcguang

components/mesh_lite/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 # ChangeLog
 
-## v1.0.2 - 2025-4-14
+## v1.0.2 - 2025-4-17
 
 ### Breaking Change:
 
@@ -13,6 +13,8 @@
 
 #### Mesh
 
+- Optimized: speed up fusion process for specific scenarios​ ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Optimized: in Mesh Lite connections, skip disconnection/reconnection if the target device matches the currently connected one ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
 - Support longer data length in espnow ([29185cc](https://github.com/espressif/esp-mesh-lite/commit/29185cc323d199e609d1ff75fe21e5dab95c4e34))
 - Support getting mesh-lite core commit ID through API ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - Optimize: The device disallowed as root node will not request to be included in the will list ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
@@ -30,6 +32,14 @@
 
 #### Bugfix
 
+- Fixed the issue that the Vendor IE information was accidentally updated when esp_wifi_connect() returned ESP_FAIL ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Fixed: The new device may disrupt the old network topology when joining a full capacity network ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Fixed the issue where the reconnection mechanism could not be enabled when the fixed root node called `esp_mesh_lite_connect()`, this regression was introduced in commit [0b8918b](https://github.com/espressif/esp-mesh-lite/commit/0b8918b28f9bb6a8ccf2f676c2005e5b0d30cdf6) ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Fixed: replace deprecated `esp_mesh_lite_try_sending_msg()` with `esp_mesh_lite_send_msg()` ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Fix abnormal fusion behavior in special situations ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+    - Devices fixed as root nodes and acting only as leaf nodes mistakenly triggered fusion, causing them to repeatedly disconnect from the router
+    - Devices fixed as root nodes and acting only as leaf nodes mistakenly triggered fusion in other devices, causing other root nodes to repeatedly disconnect from the router
+    - Root nodes with the maximum layer set to 1 mistakenly triggered fusion in other devices, causing other root nodes to repeatedly disconnect from the router
 - Fixed: It blocked the system when calling esp_mesh_lite_send_msg in the send_fail callback ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - Fixed: It failed to set the level to 0 when disallowed_level had been set 0 ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - Fixed: The last connected child node will be de-authenticated though the number of child nodes does not exceed the maximum limit ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))

components/mesh_lite/CHANGELOG_CN.md

@@ -1,6 +1,6 @@
 # ChangeLog
 
-## v1.0.2 - 2025-4-14
+## v1.0.2 - 2025-4-17
 
 ### Breaking Change:
 
@@ -11,6 +11,8 @@
 
 #### Mesh
 
+- 优化部分场景下的融合过程，缩短融合时间 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- Mesh Lite 连接中，若待连接设备与当前连接设备相同，无需断开重连 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
 - 支持 espnow 发送更长的数据 ([29185cc](https://github.com/espressif/esp-mesh-lite/commit/29185cc323d199e609d1ff75fe21e5dab95c4e34))
 - 新增 API 以获取当前 mesh-lite 库的 commit id ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - 当设备被禁止成为根节点时将不会被加入到 “遗嘱” 列表中 ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
@@ -28,6 +30,14 @@
 
 #### Bugfix
 
+- 修复调用 `esp_wifi_connect()` 失败时错误地更新 Vendor IE 信息 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- 修复新设备加入满载网络时可能会破坏原有拓扑结构的问题 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- 修复设备作为固定根节点时，调用 `esp_mesh_lite_connect()` 未触发重连机制的问题，该问题由提交 [0b8918b](https://github.com/espressif/esp-mesh-lite/commit/0b8918b28f9bb6a8ccf2f676c2005e5b0d30cdf6) 引入 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- 将废弃的 `esp_mesh_lite_try_sending_msg()` 替换为 `esp_mesh_lite_send_msg()` ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+- 修复特殊情况下的异常融合行为 ([544b925](https://github.com/espressif/esp-mesh-lite/commit/544b925c705b80acf823216f8236bf57339c7b9f))
+    - 固定为根节点且仅作为叶节点的设备，误触发了融合导致其反复断开路由器
+    - 固定为根节点且仅作为叶节点的设备，误触发其它设备融合，导致其他根节点反复断开路由器
+    - 最高层级设置为 1 的根节点，误触发其它设备融合，导致其他根节点反复断开路由器
 - 修复在 send_fail cb 中调用 esp_mesh_lite_send_msg 会造成系统卡死问题 ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - 修复当不禁用设备层级时，无法设置设备 level 为 0 的问题 ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))
 - 修复在子节点数量没有超过最大限制的情况下，最后一个接入的子节点被 deauth 的问题 ([6265503](https://github.com/espressif/esp-mesh-lite/commit/62655031e5dc527d35ebb2c51389f100208991cd))

components/mesh_lite/lib/VERSION

@@ -1,8 +1,8 @@
 version
-libesp_mesh_lite_esp32.a   :b24c767
-libesp_mesh_lite_esp32c2.a :b24c767
-libesp_mesh_lite_esp32c3.a :b24c767
-libesp_mesh_lite_esp32c5.a :b24c767
-libesp_mesh_lite_esp32c6.a :b24c767
-libesp_mesh_lite_esp32s2.a :b24c767
-libesp_mesh_lite_esp32s3.a :b24c767
+libesp_mesh_lite_esp32.a   :55a2810
+libesp_mesh_lite_esp32c2.a :55a2810
+libesp_mesh_lite_esp32c3.a :55a2810
+libesp_mesh_lite_esp32c5.a :55a2810
+libesp_mesh_lite_esp32c6.a :55a2810
+libesp_mesh_lite_esp32s2.a :55a2810
+libesp_mesh_lite_esp32s3.a :55a2810

components/mesh_lite/lib/libesp_mesh_lite_esp32.a

@@ -65,7 +65,18 @@ esp_err_t esp_mesh_lite_report_info(void)
     uint32_t outlen = mesh_lite__node_data__get_packed_size(&req);
     uint8_t *outdata = malloc(outlen);
     mesh_lite__node_data__pack(&req, outdata);
-    esp_mesh_lite_try_sending_raw_msg(MESH_LITE_MSG_ID_REPORT_NODE_INFO, MESH_LITE_MSG_ID_REPORT_NODE_INFO_RESP, 3, outdata, outlen, esp_mesh_lite_send_raw_msg_to_root);
+
+    esp_mesh_lite_msg_config_t config = {
+        .raw_msg = {
+            .msg_id = MESH_LITE_MSG_ID_REPORT_NODE_INFO,
+            .expect_resp_msg_id = MESH_LITE_MSG_ID_REPORT_NODE_INFO_RESP,
+            .max_retry = 3,
+            .data = outdata,
+            .size = outlen,
+            .raw_resend = esp_mesh_lite_send_raw_msg_to_root,
+        },
+    };
+    esp_mesh_lite_send_msg(ESP_MESH_LITE_RAW_MSG, &config);
     free(outdata);
 
     return ESP_OK;
@@ -211,7 +222,17 @@ static esp_err_t mesh_lite_update_nodes_list(uint8_t *data, uint32_t len, uint8_
         mesh_lite__data__free_unpacked(req, NULL);
     }
 
-    esp_mesh_lite_try_sending_raw_msg(MESH_LITE_MSG_ID_UPDATE_NODES_LIST, 0, 0, data, len, esp_mesh_lite_send_broadcast_raw_msg_to_child);
+    esp_mesh_lite_msg_config_t config = {
+        .raw_msg = {
+            .msg_id = MESH_LITE_MSG_ID_UPDATE_NODES_LIST,
+            .expect_resp_msg_id = 0,
+            .max_retry = 0,
+            .data = data,
+            .size = len,
+            .raw_resend = esp_mesh_lite_send_broadcast_raw_msg_to_child,
+        },
+    };
+    esp_mesh_lite_send_msg(ESP_MESH_LITE_RAW_MSG, &config);
     return ret;
 }
 
@@ -297,7 +318,17 @@ static esp_err_t esp_mesh_lite_update_nodes_info_to_children(void)
         }
         free(req.nodes);
 
-        esp_mesh_lite_try_sending_raw_msg(MESH_LITE_MSG_ID_UPDATE_NODES_LIST, 0, 3, outdata, outlen, esp_mesh_lite_send_broadcast_raw_msg_to_child);
+        esp_mesh_lite_msg_config_t config = {
+            .raw_msg = {
+                .msg_id = MESH_LITE_MSG_ID_UPDATE_NODES_LIST,
+                .expect_resp_msg_id = 0,
+                .max_retry = 3,
+                .data = outdata,
+                .size = outlen,
+                .raw_resend = esp_mesh_lite_send_broadcast_raw_msg_to_child,
+            },
+        };
+        esp_mesh_lite_send_msg(ESP_MESH_LITE_RAW_MSG, &config);
         free(outdata);
     }
     return ESP_OK;

components/mesh_lite/lib/libesp_mesh_lite_esp32c2.a

@@ -583,18 +583,25 @@ static void zero_prov_event_handle(zero_prov_act_t* pact, zero_prov_event_id_t e
     }
 }
 
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+static void zero_prov_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
+#else
 static void zero_prov_send_cb(const uint8_t *mac_addr, esp_now_send_status_t status)
+#endif
 {
     zero_prov_event_t evt;
     zero_prov_send_cb_t *send_cb = &evt.info.send_cb;
-    bool is_broadcast =  IS_BROADCAST_ADDR(mac_addr);
-
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+    const uint8_t *mac_addr = tx_info->des_addr;
+    if (tx_info == NULL) {
+#else
     if (mac_addr == NULL) {
+#endif
         ESP_LOGE(TAG, "Send cb arg error");
         return;
     }
 
-    if (is_broadcast) {
+    if (IS_BROADCAST_ADDR(mac_addr)) {
         evt.id = ZERO_PROV_SEND_BROADCAST;
     } else {
         evt.id = ZERO_PROV_SEND_UNICAST_DATA;

components/mesh_lite/lib/libesp_mesh_lite_esp32c3.a

@@ -49,7 +49,16 @@ esp_err_t app_rmaker_mesh_lite_report_child_info(void)
         cJSON_AddNumberToObject(item, "level", esp_mesh_lite_get_level());
         cJSON_AddStringToObject(item, "mac", mac_str);
         cJSON_AddStringToObject(item, "ip", ip_str);
-        esp_mesh_lite_try_sending_msg("report_child_info", "report_child_info_ack", MAX_RETRY, item, &esp_mesh_lite_send_msg_to_parent);
+        esp_mesh_lite_msg_config_t config = {
+            .json_msg = {
+                .send_msg = "report_child_info",
+                .expect_msg = "report_child_info_ack",
+                .max_retry = MAX_RETRY,
+                .req_payload = item,
+                .resend = esp_mesh_lite_send_msg_to_parent,
+            }
+        };
+        esp_mesh_lite_send_msg(ESP_MESH_LITE_JSON_MSG, &config);
         cJSON_Delete(item);
     }
 

components/mesh_lite/lib/libesp_mesh_lite_esp32c5.a

@@ -169,9 +169,18 @@ void esp_now_remove_send_msgs(void)
 /* ESPNOW sending or receiving callback function is called in WiFi task.
  * Users should not do lengthy operations from this task. Instead, post
  * necessary data to a queue and handle it from a lower priority task. */
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+static void espnow_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
+#else
 static void espnow_send_cb(const uint8_t *mac_addr, esp_now_send_status_t status)
+#endif
 {
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+    const uint8_t *mac_addr = tx_info->des_addr;
+    if (tx_info == NULL) {
+#else
     if (mac_addr == NULL) {
+#endif
         ESP_LOGE(TAG, "Send cb arg error");
         return;
     }

components/mesh_lite/lib/libesp_mesh_lite_esp32c6.a

@@ -164,9 +164,18 @@ void esp_now_remove_send_msgs(void)
 /* ESPNOW sending or receiving callback function is called in WiFi task.
  * Users should not do lengthy operations from this task. Instead, post
  * necessary data to a queue and handle it from a lower priority task. */
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+static void espnow_send_cb(const esp_now_send_info_t *tx_info, esp_now_send_status_t status)
+#else
 static void espnow_send_cb(const uint8_t *mac_addr, esp_now_send_status_t status)
+#endif
 {
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 4, 1)
+    const uint8_t *mac_addr = tx_info->des_addr;
+    if (tx_info == NULL) {
+#else
     if (mac_addr == NULL) {
+#endif
         ESP_LOGE(TAG, "Send cb arg error");
         return;
     }