patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: samples/mesh_demo: Fix address handling

Browse source 
Clean up and fix the address handling.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2017-11-22 11:35:32 +02:00 committed by Johan Hedberg
parent 6fda8b2b4d
commit 4fe3e03152
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
samples/bluetooth/mesh_demo/src/board.h
View file

@ -6,6 +6,10 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#if !defined(NODE_ADDR)
#define NODE_ADDR 0x0b0c
#endif
void board_button_1_pressed(void); void board_button_1_pressed(void);
u16_t board_set_target(void); u16_t board_set_target(void);
void board_play(const char *str); void board_play(const char *str);
@ -20,7 +24,7 @@ void board_attention(bool attention);
#else #else
static inline void board_init(u16_t *addr, u32_t *seq) static inline void board_init(u16_t *addr, u32_t *seq)
{ {
*addr = 0x0b0c; *addr = NODE_ADDR;
*seq = 0; *seq = 0;
} }

12
samples/bluetooth/mesh_demo/src/main.c
View file

@ -17,7 +17,7 @@
#define MOD_INTEL 0x0000 #define MOD_INTEL 0x0000
#define GROUP_ADDR 0xc000 #define GROUP_ADDR 0xc000
#define PROV_ADDR 0x000f #define PUBLISHER_ADDR 0x000f
#define OP_VENDOR_BUTTON BT_MESH_MODEL_OP_3(0x00, CID_INTEL) #define OP_VENDOR_BUTTON BT_MESH_MODEL_OP_3(0x00, CID_INTEL)
@ -37,15 +37,9 @@ static const u16_t net_idx;
static const u16_t app_idx; static const u16_t app_idx;
static const u32_t iv_index; static const u32_t iv_index;
static u8_t flags; static u8_t flags;
#if defined(NODE_ADDR)
static u16_t addr = NODE_ADDR; static u16_t addr = NODE_ADDR;
#else
static u16_t addr = 0x0b0c;
#endif
static u32_t seq; static u32_t seq;
#define PROVISIONER_ADDR 0x0001
static void heartbeat(u8_t hops, u16_t feat) static void heartbeat(u8_t hops, u16_t feat)
{ {
board_heartbeat(hops, feat); board_heartbeat(hops, feat);
@ -157,7 +151,7 @@ static void configure(void)
bt_mesh_cfg_mod_sub_add_vnd(net_idx, addr, addr, GROUP_ADDR, bt_mesh_cfg_mod_sub_add_vnd(net_idx, addr, addr, GROUP_ADDR,
MOD_INTEL, CID_INTEL, NULL); MOD_INTEL, CID_INTEL, NULL);
#if defined(NODE_ADDR) && NODE_ADDR == PROV_ADDR #if NODE_ADDR == PUBLISHER_ADDR
{ {
struct bt_mesh_cfg_hb_pub pub = { struct bt_mesh_cfg_hb_pub pub = {
.dst = GROUP_ADDR, .dst = GROUP_ADDR,
@ -174,7 +168,7 @@ static void configure(void)
#else #else
{ {
struct bt_mesh_cfg_hb_sub sub = { struct bt_mesh_cfg_hb_sub sub = {
.src = PROV_ADDR, .src = PUBLISHER_ADDR,
.dst = GROUP_ADDR, .dst = GROUP_ADDR,
.period = 0x10, .period = 0x10,
}; };