michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Restore default device configuration on reset

Browse source 
This commit fixes an issue where bt_mesh_reset() call just erases all
mesh flags set at the initialization instead of restoring them and
thus disabling some features until the board reboot.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2021-06-23 16:27:35 +02:00 • committed by Johan Hedberg
commit 6c9411656c
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/mesh/cfg.c
View file

@ -250,7 +250,7 @@ bool bt_mesh_fixed_group_match(uint16_t addr)
} }
} }
void bt_mesh_cfg_init(void) void bt_mesh_cfg_default_set(void)
{ {
bt_mesh.default_ttl = CONFIG_BT_MESH_DEFAULT_TTL; bt_mesh.default_ttl = CONFIG_BT_MESH_DEFAULT_TTL;
bt_mesh.net_xmit = bt_mesh.net_xmit =

2
subsys/bluetooth/mesh/cfg.h
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
void bt_mesh_cfg_init(void); void bt_mesh_cfg_default_set(void);
void bt_mesh_cfg_pending_store(void); void bt_mesh_cfg_pending_store(void);
bool bt_mesh_fixed_group_match(uint16_t addr); bool bt_mesh_fixed_group_match(uint16_t addr);

2
subsys/bluetooth/mesh/cfg_srv.c
View file

@ -2442,7 +2442,7 @@ static void mod_reset(struct bt_mesh_model *mod, struct bt_mesh_elem *elem,
} }
} }
void bt_mesh_cfg_reset(void) void bt_mesh_model_reset(void)
{ {
bt_mesh_model_foreach(mod_reset, NULL); bt_mesh_model_foreach(mod_reset, NULL);
} }

2
subsys/bluetooth/mesh/foundation.h
View file

@ -112,7 +112,7 @@
#define STATUS_UNSPECIFIED 0x10 #define STATUS_UNSPECIFIED 0x10
#define STATUS_INVALID_BINDING 0x11 #define STATUS_INVALID_BINDING 0x11
void bt_mesh_cfg_reset(void); void bt_mesh_model_reset(void);
void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time); void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time);

5
subsys/bluetooth/mesh/main.c
View file

@ -174,7 +174,8 @@ void bt_mesh_reset(void)
*/ */
(void)k_work_cancel_delayable(&bt_mesh.ivu_timer); (void)k_work_cancel_delayable(&bt_mesh.ivu_timer);
bt_mesh_cfg_reset(); bt_mesh_model_reset();
bt_mesh_cfg_default_set();
bt_mesh_trans_reset(); bt_mesh_trans_reset();
bt_mesh_app_keys_reset(); bt_mesh_app_keys_reset();
bt_mesh_net_keys_reset(); bt_mesh_net_keys_reset();
@ -331,7 +332,7 @@ int bt_mesh_init(const struct bt_mesh_prov *prov,
} }
} }
bt_mesh_cfg_init(); bt_mesh_cfg_default_set();
bt_mesh_net_init(); bt_mesh_net_init();
bt_mesh_trans_init(); bt_mesh_trans_init();
bt_mesh_hb_init(); bt_mesh_hb_init();