espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-08-19 16:30:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

porting: fix blemesh build after mesh sync

Browse Source
This commit is contained in:
Krzysztof Kopyściński
2021-11-10 06:24:00 +01:00
committed by Krzysztof Kopyściński
parent 40dddfdfc3
commit 5cc57dee07
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
porting/examples/linux_blemesh/ble.c
+30 -16
View File
@@ -142,11 +142,12 @@ static struct bt_mesh_model_pub gen_onoff_pub;
static uint8_t gen_on_off_state;
static int16_t gen_level_state;
static void gen_onoff_status(struct bt_mesh_model *model,
static int gen_onoff_status(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx)
{
struct os_mbuf *msg = NET_BUF_SIMPLE(3);
uint8_t *status;
int rc;
console_printf("#mesh-onoff STATUS\n");
@@ -154,23 +155,25 @@ static void gen_onoff_status(struct bt_mesh_model *model,
status = net_buf_simple_add(msg, 1);
*status = gen_on_off_state;
if (bt_mesh_model_send(model, ctx, msg, NULL, NULL)) {
rc = bt_mesh_model_send(model, ctx, msg, NULL, NULL);
if (rc) {
console_printf("#mesh-onoff STATUS: send status failed\n");
}
os_mbuf_free_chain(msg);
return rc;
}
static void gen_onoff_get(struct bt_mesh_model *model,
static int gen_onoff_get(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
console_printf("#mesh-onoff GET\n");
gen_onoff_status(model, ctx);
return gen_onoff_status(model, ctx);
}
static void gen_onoff_set(struct bt_mesh_model *model,
static int gen_onoff_set(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
@@ -178,16 +181,17 @@ static void gen_onoff_set(struct bt_mesh_model *model,
gen_on_off_state = buf->om_data[0];
gen_onoff_status(model, ctx);
return gen_onoff_status(model, ctx);
}
static void gen_onoff_set_unack(struct bt_mesh_model *model,
static int gen_onoff_set_unack(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
console_printf("#mesh-onoff SET-UNACK\n");
gen_on_off_state = buf->om_data[0];
return 0;
}
static const struct bt_mesh_model_op gen_onoff_op[] = {
@@ -214,16 +218,17 @@ static void gen_level_status(struct bt_mesh_model *model,
os_mbuf_free_chain(msg);
}
static void gen_level_get(struct bt_mesh_model *model,
static int gen_level_get(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
console_printf("#mesh-level GET\n");
gen_level_status(model, ctx);
return 0;
}
static void gen_level_set(struct bt_mesh_model *model,
static int gen_level_set(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
@@ -236,9 +241,10 @@ static void gen_level_set(struct bt_mesh_model *model,
gen_level_state = level;
console_printf("#mesh-level: level=%d\n", gen_level_state);
return 0;
}
static void gen_level_set_unack(struct bt_mesh_model *model,
static int gen_level_set_unack(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
@@ -249,9 +255,10 @@ static void gen_level_set_unack(struct bt_mesh_model *model,
gen_level_state = level;
console_printf("#mesh-level: level=%d\n", gen_level_state);
return 0;
}
static void gen_delta_set(struct bt_mesh_model *model,
static int gen_delta_set(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
@@ -264,9 +271,10 @@ static void gen_delta_set(struct bt_mesh_model *model,
gen_level_state += delta_level;
console_printf("#mesh-level: level=%d\n", gen_level_state);
return 0;
}
static void gen_delta_set_unack(struct bt_mesh_model *model,
static int gen_delta_set_unack(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
@@ -277,18 +285,21 @@ static void gen_delta_set_unack(struct bt_mesh_model *model,
gen_level_state += delta_level;
console_printf("#mesh-level: level=%d\n", gen_level_state);
return 0;
}
static void gen_move_set(struct bt_mesh_model *model,
static int gen_move_set(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
return 0;
}
static void gen_move_set_unack(struct bt_mesh_model *model,
static int gen_move_set_unack(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
return 0;
}
static const struct bt_mesh_model_op gen_level_op[] = {
@@ -313,11 +324,12 @@ static struct bt_mesh_model root_models[] = {
static struct bt_mesh_model_pub vnd_model_pub;
static void vnd_model_recv(struct bt_mesh_model *model,
static int vnd_model_recv(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx,
struct os_mbuf *buf)
{
struct os_mbuf *msg = NET_BUF_SIMPLE(3);
int rc;
console_printf("#vendor-model-recv\n");
@@ -327,11 +339,13 @@ static void vnd_model_recv(struct bt_mesh_model *model,
bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_3(0x01, CID_VENDOR));
os_mbuf_append(msg, buf->om_data, buf->om_len);
if (bt_mesh_model_send(model, ctx, msg, NULL, NULL)) {
rc = bt_mesh_model_send(model, ctx, msg, NULL, NULL);
if (rc) {
console_printf("#vendor-model-recv: send rsp failed\n");
}
os_mbuf_free_chain(msg);
return rc;
}
static const struct bt_mesh_model_op vnd_model_op[] = {
porting/examples/linux_blemesh/include/syscfg/syscfg.h
+4
View File
@@ -1260,6 +1260,10 @@
#define MYNEWT_VAL_BLE_MESH_GATT_PROXY_ENABLED (1)
#endif
#ifndef MYNEWT_VAL_BLE_MESH_GATT_SERVER
#define MYNEWT_VAL_BLE_MESH_GATT_SERVER (1)
#endif
#ifndef MYNEWT_VAL_BLE_MESH_FRIEND_ENABLED
#define MYNEWT_VAL_BLE_MESH_FRIEND_ENABLED (1)
#endif