Merge branch 'fix/ble_mesh_heartbeat_bug_v5.0' into 'release/v5.0'

Isl2017 · Isl2017 · commit 2178173ff486 · 2024-12-02T11:29:37.000+08:00
fix(ble_mesh): fixed heartbeat issue (v5.0)

See merge request espressif/esp-idf!34962
diff --git a/components/bt/esp_ble_mesh/mesh_core/settings.c b/components/bt/esp_ble_mesh/mesh_core/settings.c
@@ -1422,6 +1422,8 @@ int settings_core_commit(void)
         struct bt_mesh_hb_pub *hb_pub = NULL;
         struct bt_mesh_cfg_srv *cfg = NULL;
 
+        bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);
+
         hb_pub = bt_mesh_hb_pub_get();
         if (hb_pub && hb_pub->dst != BLE_MESH_ADDR_UNASSIGNED &&
                 hb_pub->count && hb_pub->period) {
@@ -1440,7 +1442,6 @@ int settings_core_commit(void)
             cfg->default_ttl = stored_cfg.cfg.default_ttl;
         }
 
-        bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);
         bt_mesh_net_start();
     }
 #endif /* CONFIG_BLE_MESH_NODE */

Original file line number	Diff line number	Diff line change
`@@ -1422,6 +1422,8 @@ int settings_core_commit(void)`
`1422`	`1422`	`struct bt_mesh_hb_pub *hb_pub = NULL;`
`1423`	`1423`	`struct bt_mesh_cfg_srv *cfg = NULL;`
`1424`	`1424`
	`1425`	`+ bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);`
	`1426`	`+`
`1425`	`1427`	`hb_pub = bt_mesh_hb_pub_get();`
`1426`	`1428`	`if (hb_pub && hb_pub->dst != BLE_MESH_ADDR_UNASSIGNED &&`
`1427`	`1429`	`hb_pub->count && hb_pub->period) {`
`@@ -1440,7 +1442,6 @@ int settings_core_commit(void)`
`1440`	`1442`	`cfg->default_ttl = stored_cfg.cfg.default_ttl;`
`1441`	`1443`	`}`
`1442`	`1444`
`1443`		`- bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);`
`1444`	`1445`	`bt_mesh_net_start();`
`1445`	`1446`	`}`
`1446`	`1447`	`#endif /* CONFIG_BLE_MESH_NODE */`