michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Make RSSI value available to mesh applications

Browse source 
By moving the rssi value from the bt_mesh_net_rx struct to the
bt_mesh_msg_ctx struct, it will be available to applications via
the mesh op callbacks.

Signed-off-by: Tobias Svehagen <tobias.svehagen@gmail.com>
This commit is contained in:
Tobias Svehagen 2019-06-11 09:37:39 +02:00 • committed by Johan Hedberg
commit 4866fa9e58
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/bluetooth/mesh/access.h
View file

@ -137,6 +137,9 @@ struct bt_mesh_msg_ctx {
/** Destination address of a received message. Not used for sending. */ /** Destination address of a received message. Not used for sending. */
u16_t recv_dst; u16_t recv_dst;
/** RSSI of received packet. Not used for sending. */
s8_t recv_rssi;
/** Received TTL value. Not used for sending. */ /** Received TTL value. Not used for sending. */
u8_t recv_ttl:7; u8_t recv_ttl:7;

7
subsys/bluetooth/host/mesh/friend.c
View file

@ -876,7 +876,7 @@ init_friend:
frnd->clear.frnd = sys_be16_to_cpu(msg->prev_addr); frnd->clear.frnd = sys_be16_to_cpu(msg->prev_addr);
BT_DBG("LPN 0x%04x rssi %d recv_delay %u poll_to %ums", BT_DBG("LPN 0x%04x rssi %d recv_delay %u poll_to %ums",
frnd->lpn, rx->rssi, frnd->recv_delay, frnd->poll_to); frnd->lpn, rx->ctx.recv_rssi, frnd->recv_delay, frnd->poll_to);
if (BT_MESH_ADDR_IS_UNICAST(frnd->clear.frnd) && if (BT_MESH_ADDR_IS_UNICAST(frnd->clear.frnd) &&
!bt_mesh_elem_find(frnd->clear.frnd)) { !bt_mesh_elem_find(frnd->clear.frnd)) {
@ -884,12 +884,13 @@ init_friend:
} }
k_delayed_work_submit(&frnd->timer, k_delayed_work_submit(&frnd->timer,
offer_delay(frnd, rx->rssi, msg->criteria)); offer_delay(frnd, rx->ctx.recv_rssi,
msg->criteria));
friend_cred_create(rx->sub, frnd->lpn, frnd->lpn_counter, friend_cred_create(rx->sub, frnd->lpn, frnd->lpn_counter,
frnd->counter); frnd->counter);
enqueue_offer(frnd, rx->rssi); enqueue_offer(frnd, rx->ctx.recv_rssi);
return 0; return 0;
} }

2
subsys/bluetooth/host/mesh/net.c
View file

@ -1297,7 +1297,7 @@ void bt_mesh_net_recv(struct net_buf_simple *data, s8_t rssi,
enum bt_mesh_net_if net_if) enum bt_mesh_net_if net_if)
{ {
NET_BUF_SIMPLE_DEFINE(buf, 29); NET_BUF_SIMPLE_DEFINE(buf, 29);
struct bt_mesh_net_rx rx = { .rssi = rssi }; struct bt_mesh_net_rx rx = { .ctx.recv_rssi = rssi };
struct net_buf_simple_state state; struct net_buf_simple_state state;
BT_DBG("rssi %d net_if %u", rssi, net_if); BT_DBG("rssi %d net_if %u", rssi, net_if);

1
subsys/bluetooth/host/mesh/net.h
View file

@ -268,7 +268,6 @@ struct bt_mesh_net_rx {
net_if:2, /* Network interface */ net_if:2, /* Network interface */
local_match:1, /* Matched a local element */ local_match:1, /* Matched a local element */
friend_match:1; /* Matched an LPN we're friends for */ friend_match:1; /* Matched an LPN we're friends for */
s8_t rssi;
}; };
/* Encoding context for Network/Transport data */ /* Encoding context for Network/Transport data */