michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix heartbeat subscription tests

Browse source 
MESH/NODE/CFG/HBS/BV-01-C expects the MinHops to be 0x7f after
disabling subscription, but 0x00 for subsequent Get requests.

MESH/NODE/CFG/HBS/BV-02-C expects us to return previous
count value and then reset it to 0.

Signed-off-by: Michał Narajowski <michal.narajowski@codecoup.pl>
This commit is contained in:
Michał Narajowski 2020-12-17 16:22:49 +01:00 • committed by Anas Nashif
commit 419d2aa85b
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2323,11 +2323,19 @@ static void heartbeat_sub_set(struct bt_mesh_model *model,
/* MESH/NODE/CFG/HBS/BV-01-C expects the MinHops to be 0x7f after /* MESH/NODE/CFG/HBS/BV-01-C expects the MinHops to be 0x7f after
* disabling subscription, but 0x00 for subsequent Get requests. * disabling subscription, but 0x00 for subsequent Get requests.
*/ */
if (!period_log) { if (sub.src == BT_MESH_ADDR_UNASSIGNED || !period_log) {
sub.min_hops = BT_MESH_TTL_MAX; sub.min_hops = BT_MESH_TTL_MAX;
} }
hb_sub_send_status(model, ctx, &sub); hb_sub_send_status(model, ctx, &sub);
/* MESH/NODE/CFG/HBS/BV-02-C expects us to return previous
* count value and then reset it to 0.
*/
if (sub.src != BT_MESH_ADDR_UNASSIGNED &&
sub.dst != BT_MESH_ADDR_UNASSIGNED && !period) {
bt_mesh_hb_sub_reset_count();
}
} }
const struct bt_mesh_model_op bt_mesh_cfg_srv_op[] = { const struct bt_mesh_model_op bt_mesh_cfg_srv_op[] = {

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

@ -308,6 +308,11 @@ uint8_t bt_mesh_hb_sub_set(uint16_t src, uint16_t dst, uint32_t period)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
void bt_mesh_hb_sub_reset_count(void)
{
sub.count = 0;
}
void bt_mesh_hb_sub_get(struct bt_mesh_hb_sub *get) void bt_mesh_hb_sub_get(struct bt_mesh_hb_sub *get)
{ {
*get = sub; *get = sub;

1
subsys/bluetooth/mesh/heartbeat.h
View file

@ -36,3 +36,4 @@ void bt_mesh_hb_feature_changed(uint16_t features);
uint8_t bt_mesh_hb_pub_set(struct bt_mesh_hb_pub *hb_pub); uint8_t bt_mesh_hb_pub_set(struct bt_mesh_hb_pub *hb_pub);
uint8_t bt_mesh_hb_sub_set(uint16_t src, uint16_t dst, uint32_t period); uint8_t bt_mesh_hb_sub_set(uint16_t src, uint16_t dst, uint32_t period);
void bt_mesh_hb_sub_reset_count(void);