espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-03 15:50:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from kolodgrz/mesh_shell_v1

Browse Source 
mesh: shell: Rename init function to avoid redefinition
This commit is contained in:
Łukasz Rymanowski
2018-05-09 17:26:44 +02:00
committed by GitHub
parent a8cf73f02c b72a225f7e
commit 4c4eb4d4ce
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/include/mesh/testing.h
+1 -1
View File
@@ -59,7 +59,7 @@ void bt_test_cb_unregister(struct bt_test_cb *cb);
u8_t mod_bind(struct bt_mesh_model *model, u16_t key_idx); u8_t mod_bind(struct bt_mesh_model *model, u16_t key_idx);
u8_t mod_unbind(struct bt_mesh_model *model, u16_t key_idx); u8_t mod_unbind(struct bt_mesh_model *model, u16_t key_idx);
int cmd_init(int argc, char *argv[]); int cmd_mesh_init(int argc, char *argv[]);
int bt_test_shell_init(void); int bt_test_shell_init(void);
int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id); int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id);
nimble/host/mesh/src/shell.c
+2 -2
View File
@@ -633,7 +633,7 @@ static int check_pub_addr_unassigned(void)
#endif #endif
} }
int cmd_init(int argc, char *argv[]) int cmd_mesh_init(int argc, char *argv[])
{ {
int err; int err;
ble_addr_t addr; ble_addr_t addr;
@@ -2374,7 +2374,7 @@ static int cmd_print_composition_data(int argc, char *argv[])
} }
static const struct shell_cmd mesh_commands[] = { static const struct shell_cmd mesh_commands[] = {
{ "init", cmd_init, NULL }, { "init", cmd_mesh_init, NULL },
#if MYNEWT_VAL(BLE_MESH_PB_ADV) #if MYNEWT_VAL(BLE_MESH_PB_ADV)
{ "pb-adv", cmd_pb_adv, &cmd_pb_help }, { "pb-adv", cmd_pb_adv, &cmd_pb_help },
#endif #endif
nimble/host/mesh/src/testing.c
+1 -1
View File
@@ -157,7 +157,7 @@ void bt_test_print_credentials(void)
int bt_test_shell_init(void) int bt_test_shell_init(void)
{ {
return cmd_init(0, NULL); return cmd_mesh_init(0, NULL);
} }
int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id) int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id)