Bluetooth: Mesh: Add support for Relay and 1-byte state Get/Set
Add support to the Configuration Client Model for getting and setting 1-byte states (which can be nicely generalized in code) as well as the 2-byte Relay state. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg
Johan Hedberg
parent
07305fd71d
commit
cbfea942f6
2 changed files with 226 additions and 14 deletions
|
|
@ -39,6 +39,25 @@ int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status);
|
|||
|
||||
int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
|
||||
|
||||
int bt_mesh_cfg_ttl_get(u16_t net_idx, u16_t addr, u8_t *ttl);
|
||||
|
||||
int bt_mesh_cfg_ttl_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *ttl);
|
||||
|
||||
int bt_mesh_cfg_friend_get(u16_t net_idx, u16_t addr, u8_t *status);
|
||||
|
||||
int bt_mesh_cfg_friend_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status);
|
||||
|
||||
int bt_mesh_cfg_gatt_proxy_get(u16_t net_idx, u16_t addr, u8_t *status);
|
||||
|
||||
int bt_mesh_cfg_gatt_proxy_set(u16_t net_idx, u16_t addr, u8_t val,
|
||||
u8_t *status);
|
||||
|
||||
int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
|
||||
u8_t *transmit);
|
||||
|
||||
int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
|
||||
u8_t new_transmit, u8_t *status, u8_t *transmit);
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -57,9 +57,10 @@ static void comp_data_status(struct bt_mesh_model *model,
|
|||
k_sem_give(&cli->op_sync);
|
||||
}
|
||||
|
||||
static void beacon_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
static void state_status_u8(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf,
|
||||
u32_t expect_status)
|
||||
{
|
||||
u8_t *status;
|
||||
|
||||
|
|
@ -67,8 +68,9 @@ static void beacon_status(struct bt_mesh_model *model,
|
|||
ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
|
||||
bt_hex(buf->data, buf->len));
|
||||
|
||||
if (cli->op_pending != OP_BEACON_STATUS) {
|
||||
BT_WARN("Unexpected Beacon Status");
|
||||
if (cli->op_pending != expect_status) {
|
||||
BT_WARN("Unexpected Status (0x%08x != 0x%08x)",
|
||||
cli->op_pending, expect_status);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -78,9 +80,68 @@ static void beacon_status(struct bt_mesh_model *model,
|
|||
k_sem_give(&cli->op_sync);
|
||||
}
|
||||
|
||||
static void beacon_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
{
|
||||
state_status_u8(model, ctx, buf, OP_BEACON_STATUS);
|
||||
}
|
||||
|
||||
static void ttl_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
{
|
||||
state_status_u8(model, ctx, buf, OP_DEFAULT_TTL_STATUS);
|
||||
}
|
||||
|
||||
static void friend_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
{
|
||||
state_status_u8(model, ctx, buf, OP_FRIEND_STATUS);
|
||||
}
|
||||
|
||||
static void gatt_proxy_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
{
|
||||
state_status_u8(model, ctx, buf, OP_GATT_PROXY_STATUS);
|
||||
}
|
||||
|
||||
struct relay_param {
|
||||
u8_t *status;
|
||||
u8_t *transmit;
|
||||
};
|
||||
|
||||
static void relay_status(struct bt_mesh_model *model,
|
||||
struct bt_mesh_msg_ctx *ctx,
|
||||
struct net_buf_simple *buf)
|
||||
{
|
||||
struct relay_param *param;
|
||||
|
||||
BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
|
||||
ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
|
||||
bt_hex(buf->data, buf->len));
|
||||
|
||||
if (cli->op_pending != OP_RELAY_STATUS) {
|
||||
BT_WARN("Unexpected Relay Status message");
|
||||
return;
|
||||
}
|
||||
|
||||
param = cli->op_param;
|
||||
*param->status = net_buf_simple_pull_u8(buf);
|
||||
*param->transmit = net_buf_simple_pull_u8(buf);
|
||||
|
||||
k_sem_give(&cli->op_sync);
|
||||
}
|
||||
|
||||
const struct bt_mesh_model_op bt_mesh_cfg_cli_op[] = {
|
||||
{ OP_DEV_COMP_DATA_STATUS, 15, comp_data_status },
|
||||
{ OP_BEACON_STATUS, 1, beacon_status },
|
||||
{ OP_DEFAULT_TTL_STATUS, 1, ttl_status },
|
||||
{ OP_FRIEND_STATUS, 1, friend_status },
|
||||
{ OP_GATT_PROXY_STATUS, 1, gatt_proxy_status },
|
||||
{ OP_RELAY_STATUS, 2, relay_status },
|
||||
BT_MESH_MODEL_OP_END,
|
||||
};
|
||||
|
||||
|
|
@ -140,7 +201,8 @@ int bt_mesh_cfg_comp_data_get(u16_t net_idx, u16_t addr, u8_t page,
|
|||
return err;
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
|
||||
static int get_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
|
||||
u8_t *val)
|
||||
{
|
||||
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 0 + 4);
|
||||
struct bt_mesh_msg_ctx ctx = {
|
||||
|
|
@ -156,7 +218,7 @@ int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
bt_mesh_model_msg_init(msg, OP_BEACON_GET);
|
||||
bt_mesh_model_msg_init(msg, op);
|
||||
|
||||
err = bt_mesh_model_send(cli->model, &ctx, msg, NULL, NULL);
|
||||
if (err) {
|
||||
|
|
@ -164,8 +226,8 @@ int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
cli->op_param = status;
|
||||
cli->op_pending = OP_BEACON_STATUS;
|
||||
cli->op_param = val;
|
||||
cli->op_pending = rsp;
|
||||
|
||||
err = k_sem_take(&cli->op_sync, MSG_TIMEOUT);
|
||||
|
||||
|
|
@ -175,7 +237,8 @@ int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
||||
static int set_state_u8(u16_t net_idx, u16_t addr, u32_t op, u32_t rsp,
|
||||
u8_t new_val, u8_t *val)
|
||||
{
|
||||
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 1 + 4);
|
||||
struct bt_mesh_msg_ctx ctx = {
|
||||
|
|
@ -191,8 +254,8 @@ int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
bt_mesh_model_msg_init(msg, OP_BEACON_SET);
|
||||
net_buf_simple_add_u8(msg, val);
|
||||
bt_mesh_model_msg_init(msg, op);
|
||||
net_buf_simple_add_u8(msg, new_val);
|
||||
|
||||
err = bt_mesh_model_send(cli->model, &ctx, msg, NULL, NULL);
|
||||
if (err) {
|
||||
|
|
@ -200,8 +263,8 @@ int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
cli->op_param = status;
|
||||
cli->op_pending = OP_BEACON_STATUS;
|
||||
cli->op_param = val;
|
||||
cli->op_pending = rsp;
|
||||
|
||||
err = k_sem_take(&cli->op_sync, MSG_TIMEOUT);
|
||||
|
||||
|
|
@ -211,6 +274,136 @@ int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
|||
return err;
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_beacon_get(u16_t net_idx, u16_t addr, u8_t *status)
|
||||
{
|
||||
return get_state_u8(net_idx, addr, OP_BEACON_GET, OP_BEACON_STATUS,
|
||||
status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_beacon_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
||||
{
|
||||
return set_state_u8(net_idx, addr, OP_BEACON_SET, OP_BEACON_STATUS,
|
||||
val, status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_ttl_get(u16_t net_idx, u16_t addr, u8_t *ttl)
|
||||
{
|
||||
return get_state_u8(net_idx, addr, OP_DEFAULT_TTL_GET,
|
||||
OP_DEFAULT_TTL_STATUS, ttl);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_ttl_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *ttl)
|
||||
{
|
||||
return set_state_u8(net_idx, addr, OP_DEFAULT_TTL_SET,
|
||||
OP_DEFAULT_TTL_STATUS, val, ttl);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_friend_get(u16_t net_idx, u16_t addr, u8_t *status)
|
||||
{
|
||||
return get_state_u8(net_idx, addr, OP_FRIEND_GET,
|
||||
OP_FRIEND_STATUS, status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_friend_set(u16_t net_idx, u16_t addr, u8_t val, u8_t *status)
|
||||
{
|
||||
return set_state_u8(net_idx, addr, OP_FRIEND_SET, OP_FRIEND_STATUS,
|
||||
val, status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_gatt_proxy_get(u16_t net_idx, u16_t addr, u8_t *status)
|
||||
{
|
||||
return get_state_u8(net_idx, addr, OP_GATT_PROXY_GET,
|
||||
OP_GATT_PROXY_STATUS, status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_gatt_proxy_set(u16_t net_idx, u16_t addr, u8_t val,
|
||||
u8_t *status)
|
||||
{
|
||||
return set_state_u8(net_idx, addr, OP_GATT_PROXY_SET,
|
||||
OP_GATT_PROXY_STATUS, val, status);
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_relay_get(u16_t net_idx, u16_t addr, u8_t *status,
|
||||
u8_t *transmit)
|
||||
{
|
||||
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 0 + 4);
|
||||
struct bt_mesh_msg_ctx ctx = {
|
||||
.net_idx = net_idx,
|
||||
.app_idx = BT_MESH_KEY_DEV,
|
||||
.addr = addr,
|
||||
.send_ttl = BT_MESH_TTL_DEFAULT,
|
||||
};
|
||||
struct relay_param param = {
|
||||
.status = status,
|
||||
.transmit = transmit,
|
||||
};
|
||||
int err;
|
||||
|
||||
err = check_cli();
|
||||
if (err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
bt_mesh_model_msg_init(msg, OP_RELAY_GET);
|
||||
|
||||
err = bt_mesh_model_send(cli->model, &ctx, msg, NULL, NULL);
|
||||
if (err) {
|
||||
BT_ERR("model_send() failed (err %d)", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
cli->op_param = ¶m;
|
||||
cli->op_pending = OP_RELAY_STATUS;
|
||||
|
||||
err = k_sem_take(&cli->op_sync, MSG_TIMEOUT);
|
||||
|
||||
cli->op_pending = 0;
|
||||
cli->op_param = NULL;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_relay_set(u16_t net_idx, u16_t addr, u8_t new_relay,
|
||||
u8_t new_transmit, u8_t *status, u8_t *transmit)
|
||||
{
|
||||
struct net_buf_simple *msg = NET_BUF_SIMPLE(2 + 2 + 4);
|
||||
struct bt_mesh_msg_ctx ctx = {
|
||||
.net_idx = net_idx,
|
||||
.app_idx = BT_MESH_KEY_DEV,
|
||||
.addr = addr,
|
||||
.send_ttl = BT_MESH_TTL_DEFAULT,
|
||||
};
|
||||
struct relay_param param = {
|
||||
.status = status,
|
||||
.transmit = transmit,
|
||||
};
|
||||
int err;
|
||||
|
||||
err = check_cli();
|
||||
if (err) {
|
||||
return err;
|
||||
}
|
||||
|
||||
bt_mesh_model_msg_init(msg, OP_RELAY_SET);
|
||||
net_buf_simple_add_u8(msg, new_relay);
|
||||
net_buf_simple_add_u8(msg, new_transmit);
|
||||
|
||||
err = bt_mesh_model_send(cli->model, &ctx, msg, NULL, NULL);
|
||||
if (err) {
|
||||
BT_ERR("model_send() failed (err %d)", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
cli->op_param = ¶m;
|
||||
cli->op_pending = OP_RELAY_STATUS;
|
||||
|
||||
err = k_sem_take(&cli->op_sync, MSG_TIMEOUT);
|
||||
|
||||
cli->op_pending = 0;
|
||||
cli->op_param = NULL;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int bt_mesh_cfg_cli_init(struct bt_mesh_model *model, bool primary)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue