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

Jiang Jiang Jian · Jiang Jiang Jian · commit ecda30011c49 · 2024-12-09T15:41:57.000+08:00
fix(ble_mesh): fixed heartbeat issue (v5.3)

See merge request espressif/esp-idf!34965
diff --git a/components/bt/esp_ble_mesh/core/storage/settings.c b/components/bt/esp_ble_mesh/core/storage/settings.c
@@ -1483,6 +1483,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) {
@@ -1501,7 +1503,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
`@@ -1483,6 +1483,8 @@ int settings_core_commit(void)`
`1483`	`1483`	`struct bt_mesh_hb_pub *hb_pub = NULL;`
`1484`	`1484`	`struct bt_mesh_cfg_srv *cfg = NULL;`
`1485`	`1485`
	`1486`	`+ bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);`
	`1487`	`+`
`1486`	`1488`	`hb_pub = bt_mesh_hb_pub_get();`
`1487`	`1489`	`if (hb_pub && hb_pub->dst != BLE_MESH_ADDR_UNASSIGNED &&`
`1488`	`1490`	`hb_pub->count && hb_pub->period) {`
`@@ -1501,7 +1503,6 @@ int settings_core_commit(void)`
`1501`	`1503`	`cfg->default_ttl = stored_cfg.cfg.default_ttl;`
`1502`	`1504`	`}`
`1503`	`1505`
`1504`		`- bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);`
`1505`	`1506`	`bt_mesh_net_start();`
`1506`	`1507`	`}`
`1507`	`1508`	`#endif /* CONFIG_BLE_MESH_NODE */`