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

fix(ble_mesh): fixed heartbeat issue (v5.0) See merge request espressif/esp-idf!34962
espressif · Dec 2, 2024 · 2178173 · 2178173
2 parents c1802d0 + 7fccbcf
commit 2178173
Showing 1 changed file with 2 additions and 1 deletion.
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 */