You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/04/05 05:24:35 UTC
[1/3] incubator-mynewt-core git commit: bletiny - use console_printf
instead of log.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 2fef21d6a -> 1f4662b1e
bletiny - use console_printf instead of log.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/adb982f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/adb982f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/adb982f8
Branch: refs/heads/develop
Commit: adb982f898b51c6ccae6e8be88e2643171835e75
Parents: 2fef21d
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 4 19:35:34 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 4 19:35:34 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/cmd.c | 74 +++++++------
apps/bletiny/src/main.c | 236 ++++++++++++++++++++----------------------
apps/bletiny/src/parse.c | 25 +++--
3 files changed, 163 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/adb982f8/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index d01b63a..b89e5e3 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -57,8 +57,7 @@ cmd_exec(const struct cmd_entry *cmds, int argc, char **argv)
cmd = parse_cmd_find(cmds, argv[1]);
if (cmd == NULL) {
- BLETINY_LOG(ERROR, "Error: unknown %s command: %s\n",
- argv[0], argv[1]);
+ console_printf("Error: unknown %s command: %s\n", argv[0], argv[1]);
return -1;
}
@@ -73,9 +72,9 @@ cmd_exec(const struct cmd_entry *cmds, int argc, char **argv)
static void
cmd_print_dsc(struct bletiny_dsc *dsc)
{
- BLETINY_LOG(INFO, " dsc_handle=%d uuid=", dsc->dsc.handle);
+ console_printf(" dsc_handle=%d uuid=", dsc->dsc.handle);
print_uuid(dsc->dsc.uuid128);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
static void
@@ -83,11 +82,11 @@ cmd_print_chr(struct bletiny_chr *chr)
{
struct bletiny_dsc *dsc;
- BLETINY_LOG(INFO, " def_handle=%d val_handle=%d properties=0x%02x "
- "uuid=", chr->chr.decl_handle, chr->chr.value_handle,
- chr->chr.properties);
+ console_printf(" def_handle=%d val_handle=%d properties=0x%02x "
+ "uuid=", chr->chr.decl_handle, chr->chr.value_handle,
+ chr->chr.properties);
print_uuid(chr->chr.uuid128);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
SLIST_FOREACH(dsc, &chr->dscs, next) {
cmd_print_dsc(dsc);
@@ -99,10 +98,10 @@ cmd_print_svc(struct bletiny_svc *svc, int print_chrs)
{
struct bletiny_chr *chr;
- BLETINY_LOG(INFO, " start=%d end=%d uuid=", svc->svc.start_handle,
- svc->svc.end_handle);
+ console_printf(" start=%d end=%d uuid=", svc->svc.start_handle,
+ svc->svc.end_handle);
print_uuid(svc->svc.uuid128);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
if (print_chrs) {
SLIST_FOREACH(chr, &svc->chrs, next) {
@@ -188,7 +187,7 @@ cmd_adv(int argc, char **argv)
if (argc > 1 && strcmp(argv[1], "stop") == 0) {
rc = bletiny_adv_stop();
if (rc != 0) {
- BLETINY_LOG(INFO, "advertise stop fail: %d\n", rc);
+ console_printf("advertise stop fail: %d\n", rc);
return rc;
}
@@ -197,13 +196,13 @@ cmd_adv(int argc, char **argv)
conn = parse_arg_kv("conn", cmd_adv_conn_modes);
if (conn == -1) {
- BLETINY_LOG(ERROR, "invalid 'conn' parameter\n");
+ console_printf("invalid 'conn' parameter\n");
return -1;
}
disc = parse_arg_kv("disc", cmd_adv_disc_modes);
if (disc == -1) {
- BLETINY_LOG(ERROR, "missing 'disc' parameter\n");
+ console_printf("missing 'disc' parameter\n");
return -1;
}
@@ -238,7 +237,7 @@ cmd_adv(int argc, char **argv)
rc = bletiny_adv_start(disc, conn, peer_addr, addr_type, ¶ms);
if (rc != 0) {
- BLETINY_LOG(INFO, "advertise fail: %d\n", rc);
+ console_printf("advertise fail: %d\n", rc);
return rc;
}
@@ -269,7 +268,7 @@ cmd_conn(int argc, char **argv)
if (argc > 1 && strcmp(argv[1], "cancel") == 0) {
rc = bletiny_conn_cancel();
if (rc != 0) {
- BLETINY_LOG(INFO, "connection cancel fail: %d\n", rc);
+ console_printf("connection cancel fail: %d\n", rc);
return rc;
}
@@ -388,7 +387,7 @@ cmd_disc_chr(int argc, char **argv)
return rc;
}
if (rc != 0) {
- BLETINY_LOG(INFO, "error discovering characteristics; rc=%d\n", rc);
+ console_printf("error discovering characteristics; rc=%d\n", rc);
return rc;
}
@@ -410,7 +409,7 @@ cmd_disc_dsc(int argc, char **argv)
rc = bletiny_disc_all_dscs(conn_handle, start_handle, end_handle);
if (rc != 0) {
- BLETINY_LOG(INFO, "error discovering descriptors; rc=%d\n", rc);
+ console_printf("error discovering descriptors; rc=%d\n", rc);
return rc;
}
@@ -439,7 +438,7 @@ cmd_disc_svc(int argc, char **argv)
}
if (rc != 0) {
- BLETINY_LOG(INFO, "error discovering services; rc=%d\n", rc);
+ console_printf("error discovering services; rc=%d\n", rc);
return rc;
}
@@ -485,7 +484,7 @@ cmd_find_inc_svcs(int argc, char **argv)
rc = bletiny_find_inc_svcs(conn_handle, start_handle, end_handle);
if (rc != 0) {
- BLETINY_LOG(INFO, "error finding included services; rc=%d\n", rc);
+ console_printf("error finding included services; rc=%d\n", rc);
return rc;
}
@@ -550,7 +549,7 @@ cmd_l2cap_update(int argc, char **argv)
rc = bletiny_l2cap_update(conn_handle, ¶ms);
if (rc != 0) {
- BLETINY_LOG(INFO, "error txing l2cap update; rc=%d\n", rc);
+ console_printf("error txing l2cap update; rc=%d\n", rc);
return rc;
}
@@ -592,7 +591,7 @@ cmd_mtu(int argc, char **argv)
rc = bletiny_exchange_mtu(conn_handle);
if (rc != 0) {
- BLETINY_LOG(INFO, "error exchanging mtu; rc=%d\n", rc);
+ console_printf("error exchanging mtu; rc=%d\n", rc);
return rc;
}
@@ -684,7 +683,7 @@ cmd_read(int argc, char **argv)
}
if (rc != 0) {
- BLETINY_LOG(INFO, "error reading characteristic; rc=%d\n", rc);
+ console_printf("error reading characteristic; rc=%d\n", rc);
return rc;
}
@@ -746,7 +745,7 @@ cmd_scan(int argc, char **argv)
rc = bletiny_scan(dur, disc, type, filt);
if (rc != 0) {
- BLETINY_LOG(INFO, "error scanning; rc=%d\n", rc);
+ console_printf("error scanning; rc=%d\n", rc);
return rc;
}
@@ -762,9 +761,8 @@ cmd_show_addr(int argc, char **argv)
{
bletiny_lock();
- BLETINY_LOG(INFO, "myaddr=");
print_addr(g_dev_addr);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
bletiny_unlock();
@@ -783,9 +781,9 @@ cmd_show_chr(int argc, char **argv)
for (i = 0; i < bletiny_num_conns; i++) {
conn = bletiny_conns + i;
- BLETINY_LOG(INFO, "CONNECTION: handle=%d addr=", conn->handle);
+ console_printf("CONNECTION: handle=%d addr=", conn->handle);
print_addr(conn->addr);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
SLIST_FOREACH(svc, &conn->svcs, next) {
cmd_print_svc(svc, 1);
@@ -808,9 +806,9 @@ cmd_show_conn(int argc, char **argv)
for (i = 0; i < bletiny_num_conns; i++) {
conn = bletiny_conns + i;
- BLETINY_LOG(INFO, "handle=%d addr=", conn->handle);
+ console_printf("handle=%d addr=", conn->handle);
print_addr(conn->addr);
- BLETINY_LOG(INFO, " addr_type=%d\n", conn->addr_type);
+ console_printf(" addr_type=%d\n", conn->addr_type);
}
bletiny_unlock();
@@ -849,9 +847,9 @@ cmd_show_svc(int argc, char **argv)
for (i = 0; i < bletiny_num_conns; i++) {
conn = bletiny_conns + i;
- BLETINY_LOG(INFO, "CONNECTION: handle=%d addr=", conn->handle);
+ console_printf("CONNECTION: handle=%d addr=", conn->handle);
print_addr(conn->addr);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
SLIST_FOREACH(svc, &conn->svcs, next) {
cmd_print_svc(svc, 0);
@@ -1140,7 +1138,7 @@ cmd_set_adv_data(void)
rc = bletiny_set_adv_data(&adv_fields);
if (rc != 0) {
- BLETINY_LOG(INFO, "error setting advertisement data; rc=%d\n", rc);
+ console_printf("error setting advertisement data; rc=%d\n", rc);
return rc;
}
@@ -1184,7 +1182,7 @@ cmd_set(int argc, char **argv)
}
if (!good) {
- BLETINY_LOG(ERROR, "Error: no valid settings specified\n");
+ console_printf("Error: no valid settings specified\n");
return -1;
}
@@ -1208,7 +1206,7 @@ cmd_term(int argc, char **argv)
rc = bletiny_term_conn(conn_handle);
if (rc != 0) {
- BLETINY_LOG(INFO, "error terminating connection; rc=%d\n", rc);
+ console_printf("error terminating connection; rc=%d\n", rc);
return rc;
}
@@ -1265,7 +1263,7 @@ cmd_update(int argc, char **argv)
rc = bletiny_update_conn(conn_handle, ¶ms);
if (rc != 0) {
- BLETINY_LOG(INFO, "error updating connection; rc=%d\n", rc);
+ console_printf("error updating connection; rc=%d\n", rc);
return rc;
}
@@ -1416,7 +1414,7 @@ cmd_write(int argc, char **argv)
}
if (rc != 0) {
- BLETINY_LOG(INFO, "error writing characteristic; rc=%d\n", rc);
+ console_printf("error writing characteristic; rc=%d\n", rc);
return rc;
}
@@ -1458,7 +1456,7 @@ cmd_b_exec(int argc, char **argv)
rc = cmd_exec(cmd_b_entries, argc, argv);
if (rc != 0) {
- BLETINY_LOG(ERROR, "error\n");
+ console_printf("error; rc=%d\n", rc);
goto done;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/adb982f8/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index e27a31c..44815fc 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -162,8 +162,8 @@ static void
bletiny_print_error(char *msg, uint16_t conn_handle,
struct ble_gatt_error *error)
{
- BLETINY_LOG(INFO, "%s: conn_handle=%d status=%d att_handle=%d\n",
- msg, conn_handle, error->status, error->att_handle);
+ console_printf("%s: conn_handle=%d status=%d att_handle=%d\n",
+ msg, conn_handle, error->status, error->att_handle);
}
static void
@@ -172,19 +172,19 @@ bletiny_print_bytes(uint8_t *bytes, int len)
int i;
for (i = 0; i < len; i++) {
- BLETINY_LOG(INFO, "%s0x%02x", i != 0 ? ":" : "", bytes[i]);
+ console_printf("%s0x%02x", i != 0 ? ":" : "", bytes[i]);
}
}
static void
bletiny_print_conn_desc(struct ble_gap_conn_desc *desc)
{
- BLETINY_LOG(INFO, "handle=%d peer_addr_type=%d peer_addr=",
- desc->conn_handle, desc->peer_addr_type);
+ console_printf("handle=%d peer_addr_type=%d peer_addr=",
+ desc->conn_handle, desc->peer_addr_type);
bletiny_print_bytes(desc->peer_addr, 6);
- BLETINY_LOG(INFO, " conn_itvl=%d conn_latency=%d supervision_timeout=%d",
- desc->conn_itvl, desc->conn_latency,
- desc->supervision_timeout);
+ console_printf(" conn_itvl=%d conn_latency=%d supervision_timeout=%d",
+ desc->conn_itvl, desc->conn_latency,
+ desc->supervision_timeout);
}
static void
@@ -196,126 +196,126 @@ bletiny_print_adv_fields(struct ble_hs_adv_fields *fields)
int i;
if (fields->flags_is_present) {
- BLETINY_LOG(INFO, " flags=0x%02x\n", fields->flags);
+ console_printf(" flags=0x%02x\n", fields->flags);
}
if (fields->uuids16 != NULL) {
- BLETINY_LOG(INFO, " uuids16(%scomplete)=",
- fields->uuids16_is_complete ? "" : "in");
+ console_printf(" uuids16(%scomplete)=",
+ fields->uuids16_is_complete ? "" : "in");
u8p = fields->uuids16;
for (i = 0; i < fields->num_uuids16; i++) {
memcpy(&u16, u8p + i * 2, 2);
- BLETINY_LOG(INFO, "0x%04x ", u16);
+ console_printf("0x%04x ", u16);
}
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->uuids32 != NULL) {
- BLETINY_LOG(INFO, " uuids32(%scomplete)=",
- fields->uuids32_is_complete ? "" : "in");
+ console_printf(" uuids32(%scomplete)=",
+ fields->uuids32_is_complete ? "" : "in");
u8p = fields->uuids32;
for (i = 0; i < fields->num_uuids32; i++) {
memcpy(&u32, u8p + i * 4, 4);
- BLETINY_LOG(INFO, "0x%08x ", (unsigned)u32);
+ console_printf("0x%08x ", (unsigned)u32);
}
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->uuids128 != NULL) {
- BLETINY_LOG(INFO, " uuids128(%scomplete)=",
- fields->uuids128_is_complete ? "" : "in");
+ console_printf(" uuids128(%scomplete)=",
+ fields->uuids128_is_complete ? "" : "in");
u8p = fields->uuids128;
for (i = 0; i < fields->num_uuids128; i++) {
print_uuid(u8p);
- BLETINY_LOG(INFO, " ");
+ console_printf(" ");
u8p += 16;
}
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->name != NULL) {
- BLETINY_LOG(INFO, " name(%scomplete)=",
- fields->name_is_complete ? "" : "in");
- BLETINY_LOG(INFO, "%*s\n", fields->name_len, fields->name);
+ console_printf(" name(%scomplete)=",
+ fields->name_is_complete ? "" : "in");
+ console_printf("%*s\n", fields->name_len, fields->name);
}
if (fields->tx_pwr_lvl_is_present) {
- BLETINY_LOG(INFO, " tx_pwr_lvl=%d\n", fields->tx_pwr_lvl);
+ console_printf(" tx_pwr_lvl=%d\n", fields->tx_pwr_lvl);
}
if (fields->device_class != NULL) {
- BLETINY_LOG(INFO, " device_class=");
+ console_printf(" device_class=");
bletiny_print_bytes(fields->device_class,
- BLE_HS_ADV_DEVICE_CLASS_LEN);
- BLETINY_LOG(INFO, "\n");
+ BLE_HS_ADV_DEVICE_CLASS_LEN);
+ console_printf("\n");
}
if (fields->slave_itvl_range != NULL) {
- BLETINY_LOG(INFO, " slave_itvl_range=");
+ console_printf(" slave_itvl_range=");
bletiny_print_bytes(fields->slave_itvl_range,
- BLE_HS_ADV_SLAVE_ITVL_RANGE_LEN);
- BLETINY_LOG(INFO, "\n");
+ BLE_HS_ADV_SLAVE_ITVL_RANGE_LEN);
+ console_printf("\n");
}
if (fields->svc_data_uuid16 != NULL) {
- BLETINY_LOG(INFO, " svc_data_uuid16=");
+ console_printf(" svc_data_uuid16=");
bletiny_print_bytes(fields->svc_data_uuid16,
- fields->svc_data_uuid16_len);
- BLETINY_LOG(INFO, "\n");
+ fields->svc_data_uuid16_len);
+ console_printf("\n");
}
if (fields->public_tgt_addr != NULL) {
- BLETINY_LOG(INFO, " public_tgt_addr=");
+ console_printf(" public_tgt_addr=");
u8p = fields->public_tgt_addr;
for (i = 0; i < fields->num_public_tgt_addrs; i++) {
print_addr(u8p);
u8p += BLE_HS_ADV_PUBLIC_TGT_ADDR_ENTRY_LEN;
}
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->appearance_is_present) {
- BLETINY_LOG(INFO, " appearance=0x%04x\n", fields->appearance);
+ console_printf(" appearance=0x%04x\n", fields->appearance);
}
if (fields->adv_itvl_is_present) {
- BLETINY_LOG(INFO, " adv_itvl=0x%04x\n", fields->adv_itvl);
+ console_printf(" adv_itvl=0x%04x\n", fields->adv_itvl);
}
if (fields->le_addr != NULL) {
- BLETINY_LOG(INFO, " le_addr=");
+ console_printf(" le_addr=");
bletiny_print_bytes(fields->le_addr, BLE_HS_ADV_LE_ADDR_LEN);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->le_role_is_present) {
- BLETINY_LOG(INFO, " le_role=0x%02x\n", fields->le_role);
+ console_printf(" le_role=0x%02x\n", fields->le_role);
}
if (fields->svc_data_uuid32 != NULL) {
- BLETINY_LOG(INFO, " svc_data_uuid32=");
+ console_printf(" svc_data_uuid32=");
bletiny_print_bytes(fields->svc_data_uuid32,
fields->svc_data_uuid32_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->svc_data_uuid128 != NULL) {
- BLETINY_LOG(INFO, " svc_data_uuid128=");
+ console_printf(" svc_data_uuid128=");
bletiny_print_bytes(fields->svc_data_uuid128,
- fields->svc_data_uuid128_len);
- BLETINY_LOG(INFO, "\n");
+ fields->svc_data_uuid128_len);
+ console_printf("\n");
}
if (fields->uri != NULL) {
- BLETINY_LOG(INFO, " uri=");
+ console_printf(" uri=");
bletiny_print_bytes(fields->uri, fields->uri_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
if (fields->mfg_data != NULL) {
- BLETINY_LOG(INFO, " mfg_data=");
+ console_printf(" mfg_data=");
bletiny_print_bytes(fields->mfg_data, fields->mfg_data_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
}
@@ -458,9 +458,8 @@ bletiny_svc_add(uint16_t conn_handle, struct ble_gatt_service *gatt_svc)
conn = bletiny_conn_find(conn_handle);
if (conn == NULL) {
- BLETINY_LOG(INFO,
- "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
- conn_handle);
+ console_printf("RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
+ conn_handle);
return NULL;
}
@@ -472,7 +471,7 @@ bletiny_svc_add(uint16_t conn_handle, struct ble_gatt_service *gatt_svc)
svc = os_memblock_get(&bletiny_svc_pool);
if (svc == NULL) {
- BLETINY_LOG(INFO, "OOM WHILE DISCOVERING SERVICE\n");
+ console_printf("OOM WHILE DISCOVERING SERVICE\n");
return NULL;
}
memset(svc, 0, sizeof *svc);
@@ -543,17 +542,15 @@ bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle,
conn = bletiny_conn_find(conn_handle);
if (conn == NULL) {
- BLETINY_LOG(INFO,
- "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
- conn_handle);
+ console_printf("RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
+ conn_handle);
return NULL;
}
svc = bletiny_svc_find(conn, svc_start_handle, NULL);
if (svc == NULL) {
- BLETINY_LOG(INFO,
- "CAN'T FIND SERVICE FOR DISCOVERED CHR; HANDLE=%d\n",
- conn_handle);
+ console_printf("CAN'T FIND SERVICE FOR DISCOVERED CHR; HANDLE=%d\n",
+ conn_handle);
return NULL;
}
@@ -565,7 +562,7 @@ bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle,
chr = os_memblock_get(&bletiny_chr_pool);
if (chr == NULL) {
- BLETINY_LOG(INFO, "OOM WHILE DISCOVERING CHARACTERISTIC\n");
+ console_printf("OOM WHILE DISCOVERING CHARACTERISTIC\n");
return NULL;
}
memset(chr, 0, sizeof *chr);
@@ -635,24 +632,22 @@ bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle,
conn = bletiny_conn_find(conn_handle);
if (conn == NULL) {
- BLETINY_LOG(INFO,
- "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
- conn_handle);
+ console_printf("RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n",
+ conn_handle);
return NULL;
}
svc = bletiny_svc_find_range(conn, chr_def_handle);
if (svc == NULL) {
- BLETINY_LOG(INFO,
- "CAN'T FIND SERVICE FOR DISCOVERED DSC; HANDLE=%d\n",
- conn_handle);
+ console_printf("CAN'T FIND SERVICE FOR DISCOVERED DSC; HANDLE=%d\n",
+ conn_handle);
return NULL;
}
chr = bletiny_chr_find(svc, chr_def_handle, NULL);
if (chr == NULL) {
- BLETINY_LOG(INFO, "CAN'T FIND CHARACTERISTIC FOR DISCOVERED DSC; "
- "HANDLE=%d\n", conn_handle);
+ console_printf("CAN'T FIND CHARACTERISTIC FOR DISCOVERED DSC; "
+ "HANDLE=%d\n", conn_handle);
return NULL;
}
@@ -664,7 +659,7 @@ bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle,
dsc = os_memblock_get(&bletiny_dsc_pool);
if (dsc == NULL) {
- BLETINY_LOG(INFO, "OOM WHILE DISCOVERING DESCRIPTOR\n");
+ console_printf("OOM WHILE DISCOVERING DESCRIPTOR\n");
return NULL;
}
memset(dsc, 0, sizeof *dsc);
@@ -714,8 +709,8 @@ bletiny_on_mtu(uint16_t conn_handle, struct ble_gatt_error *error,
if (error != NULL) {
bletiny_print_error("ERROR EXCHANGING MTU", conn_handle, error);
} else {
- BLETINY_LOG(INFO, "mtu exchange complete: conn_handle=%d mtu=%d\n",
- conn_handle, mtu);
+ console_printf("mtu exchange complete: conn_handle=%d mtu=%d\n",
+ conn_handle, mtu);
}
return 0;
@@ -732,7 +727,7 @@ bletiny_on_disc_s(uint16_t conn_handle, struct ble_gatt_error *error,
} else if (service != NULL) {
bletiny_svc_add(conn_handle, service);
} else {
- BLETINY_LOG(INFO, "service discovery successful\n");
+ console_printf("service discovery successful\n");
}
bletiny_unlock();
@@ -756,7 +751,7 @@ bletiny_on_disc_c(uint16_t conn_handle, struct ble_gatt_error *error,
bletiny_chr_add(conn_handle, svc_start_handle, chr);
bletiny_unlock();
} else {
- BLETINY_LOG(INFO, "characteristic discovery successful\n");
+ console_printf("characteristic discovery successful\n");
}
return 0;
@@ -775,7 +770,7 @@ bletiny_on_disc_d(uint16_t conn_handle, struct ble_gatt_error *error,
} else if (dsc != NULL) {
bletiny_dsc_add(conn_handle, chr_def_handle, dsc);
} else {
- BLETINY_LOG(INFO, "descriptor discovery successful\n");
+ console_printf("descriptor discovery successful\n");
}
bletiny_unlock();
@@ -791,13 +786,13 @@ bletiny_on_read(uint16_t conn_handle, struct ble_gatt_error *error,
bletiny_print_error("ERROR READING CHARACTERISTIC", conn_handle,
error);
} else if (attr != NULL) {
- BLETINY_LOG(INFO, "characteristic read; conn_handle=%d "
- "attr_handle=%d len=%d value=", conn_handle,
- attr->handle, attr->value_len);
+ console_printf("characteristic read; conn_handle=%d "
+ "attr_handle=%d len=%d value=", conn_handle,
+ attr->handle, attr->value_len);
bletiny_print_bytes(attr->value, attr->value_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
} else {
- BLETINY_LOG(INFO, "characteristic read complete\n");
+ console_printf("characteristic read complete\n");
}
return 0;
@@ -814,16 +809,15 @@ bletiny_on_read_mult(uint16_t conn_handle, struct ble_gatt_error *error,
bletiny_print_error("ERROR READING CHARACTERISTICS", conn_handle,
error);
} else {
- BLETINY_LOG(INFO,
- "multiple characteristic read complete; conn_handle=%d "
- "attr_handles=", conn_handle);
+ console_printf("multiple characteristic read complete; conn_handle=%d "
+ "attr_handles=", conn_handle);
for (i = 0; i < num_attr_handles; i++) {
- BLETINY_LOG(INFO, "%s%d", i != 0 ? "," : "", attr_handles[i]);
+ console_printf("%s%d", i != 0 ? "," : "", attr_handles[i]);
}
- BLETINY_LOG(INFO, " len=%d value=", attr_data_len);
+ console_printf(" len=%d value=", attr_data_len);
bletiny_print_bytes(attr_data, attr_data_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
return 0;
@@ -838,11 +832,11 @@ bletiny_on_write(uint16_t conn_handle, struct ble_gatt_error *error,
bletiny_print_error("ERROR WRITING CHARACTERISTIC", conn_handle,
error);
} else {
- BLETINY_LOG(INFO, "characteristic write complete; conn_handle=%d "
- "attr_handle=%d len=%d value=", conn_handle,
- attr->handle, attr->value_len);
+ console_printf("characteristic write complete; conn_handle=%d "
+ "attr_handle=%d len=%d value=", conn_handle,
+ attr->handle, attr->value_len);
bletiny_print_bytes(attr->value, attr->value_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
return 0;
@@ -859,15 +853,15 @@ bletiny_on_write_reliable(uint16_t conn_handle, struct ble_gatt_error *error,
bletiny_print_error("ERROR WRITING CHARACTERISTICS RELIABLY",
conn_handle, error);
} else {
- BLETINY_LOG(INFO, "characteristic write reliable complete; "
- "conn_handle=%d", conn_handle);
+ console_printf("characteristic write reliable complete; "
+ "conn_handle=%d", conn_handle);
for (i = 0; i < num_attrs; i++) {
- BLETINY_LOG(INFO, " attr_handle=%d len=%d value=", attrs[i].handle,
- attrs[i].value_len);
+ console_printf(" attr_handle=%d len=%d value=", attrs[i].handle,
+ attrs[i].value_len);
bletiny_print_bytes(attrs[i].value, attrs[i].value_len);
}
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
}
return 0;
@@ -877,11 +871,11 @@ static int
bletiny_on_notify(uint16_t conn_handle, uint16_t attr_handle,
uint8_t *attr_val, uint16_t attr_len, void *arg)
{
- BLETINY_LOG(INFO, "received notification from conn_handle=%d attr=%d "
- "len=%d value=", conn_handle, attr_handle, attr_len);
+ console_printf("received notification from conn_handle=%d attr=%d "
+ "len=%d value=", conn_handle, attr_handle, attr_len);
bletiny_print_bytes(attr_val, attr_len);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
return 0;
}
@@ -896,22 +890,22 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt,
switch (event) {
case BLE_GAP_EVENT_CONN:
- BLETINY_LOG(INFO, "connection %s; status=%d ",
- status == 0 ? "up" : "down", status);
+ console_printf("connection %s; status=%d ",
+ status == 0 ? "up" : "down", status);
bletiny_print_conn_desc(ctxt->desc);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
if (status == 0) {
bletiny_conn_add(ctxt->desc);
} else {
if (ctxt->desc->conn_handle == BLE_HS_CONN_HANDLE_NONE) {
if (status == BLE_HS_HCI_ERR(BLE_ERR_UNK_CONN_ID)) {
- BLETINY_LOG(INFO, "connection procedure cancelled.\n");
+ console_printf("connection procedure cancelled.\n");
}
} else {
conn_idx = bletiny_conn_find_idx(ctxt->desc->conn_handle);
if (conn_idx == -1) {
- BLETINY_LOG(INFO, "UNKNOWN CONNECTION\n");
+ console_printf("UNKNOWN CONNECTION\n");
} else {
bletiny_conn_delete_idx(conn_idx);
}
@@ -923,13 +917,13 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt,
break;
case BLE_GAP_EVENT_CONN_UPDATED:
- BLETINY_LOG(INFO, "connection updated; status=%d ", status);
+ console_printf("connection updated; status=%d ", status);
bletiny_print_conn_desc(ctxt->desc);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
break;
case BLE_GAP_EVENT_CONN_UPDATE_REQ:
- BLETINY_LOG(INFO, "connection update request; status=%d ", status);
+ console_printf("connection update request; status=%d ", status);
*ctxt->update.self_params = *ctxt->update.peer_params;
break;
}
@@ -942,13 +936,13 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt,
static void
bletiny_on_l2cap_update(int status, void *arg)
{
- BLETINY_LOG(INFO, "l2cap update complete; status=%d\n", status);
+ console_printf("l2cap update complete; status=%d\n", status);
}
static void
bletiny_on_wl_set(int status, void *arg)
{
- BLETINY_LOG(INFO, "white list set status=%d\n", status);
+ console_printf("white list set status=%d\n", status);
}
static void
@@ -957,19 +951,19 @@ bletiny_on_scan(int event, int status, struct ble_gap_disc_desc *desc,
{
switch (event) {
case BLE_GAP_EVENT_DISC_SUCCESS:
- BLETINY_LOG(INFO, "received advertisement; event_type=%d addr_type=%d "
- "addr=", desc->event_type, desc->addr_type);
+ console_printf("received advertisement; event_type=%d addr_type=%d "
+ "addr=", desc->event_type, desc->addr_type);
bletiny_print_bytes(desc->addr, 6);
- BLETINY_LOG(INFO, " length_data=%d rssi=%d data=", desc->length_data,
- desc->rssi);
+ console_printf(" length_data=%d rssi=%d data=", desc->length_data,
+ desc->rssi);
bletiny_print_bytes(desc->data, desc->length_data);
- BLETINY_LOG(INFO, " fields:\n");
+ console_printf(" fields:\n");
bletiny_print_adv_fields(desc->fields);
- BLETINY_LOG(INFO, "\n");
+ console_printf("\n");
break;
case BLE_GAP_EVENT_DISC_FINISHED:
- BLETINY_LOG(INFO, "scanning finished; status=%d\n", status);
+ console_printf("scanning finished; status=%d\n", status);
break;
default:
@@ -984,8 +978,8 @@ bletiny_on_rx_rssi(struct ble_hci_ack *ack, void *unused)
struct hci_read_rssi_ack_params params;
if (ack->bha_params_len != BLE_HCI_READ_RSSI_ACK_PARAM_LEN) {
- BLETINY_LOG(INFO, "invalid rssi response; len=%d\n",
- ack->bha_params_len);
+ console_printf("invalid rssi response; len=%d\n",
+ ack->bha_params_len);
return;
}
@@ -993,8 +987,8 @@ bletiny_on_rx_rssi(struct ble_hci_ack *ack, void *unused)
params.connection_handle = le16toh(ack->bha_params + 1);
params.rssi = ack->bha_params[3];
- BLETINY_LOG(INFO, "rssi response received; status=%d conn=%d rssi=%d\n",
- params.status, params.connection_handle, params.rssi);
+ console_printf("rssi response received; status=%d conn=%d rssi=%d\n",
+ params.status, params.connection_handle, params.rssi);
}
int
@@ -1280,7 +1274,7 @@ bletiny_tx_rssi_req(void *arg)
rc = host_hci_cmd_read_rssi(conn_handle);
if (rc != 0) {
- BLETINY_LOG(ERROR, "failure to send rssi hci cmd; rc=%d\n", rc);
+ console_printf("failure to send rssi hci cmd; rc=%d\n", rc);
return rc;
}
@@ -1295,7 +1289,7 @@ bletiny_show_rssi(uint16_t conn_handle)
rc = ble_hci_sched_enqueue(bletiny_tx_rssi_req,
(void *)(intptr_t)conn_handle, NULL);
if (rc != 0) {
- BLETINY_LOG(ERROR, "failure to enqueue rssi hci cmd; rc=%d\n", rc);
+ console_printf("failure to enqueue rssi hci cmd; rc=%d\n", rc);
return rc;
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/adb982f8/apps/bletiny/src/parse.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/parse.c b/apps/bletiny/src/parse.c
index b95dac2..5583ccc 100644
--- a/apps/bletiny/src/parse.c
+++ b/apps/bletiny/src/parse.c
@@ -38,8 +38,8 @@ print_addr(void *addr)
uint8_t *u8p;
u8p = addr;
- BLETINY_LOG(INFO, "%02x:%02x:%02x:%02x:%02x:%02x",
- u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]);
+ console_printf("%02x:%02x:%02x:%02x:%02x:%02x",
+ u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]);
}
void
@@ -50,26 +50,25 @@ print_uuid(void *uuid128)
uuid16 = ble_uuid_128_to_16(uuid128);
if (uuid16 != 0) {
- BLETINY_LOG(INFO, "0x%04x", uuid16);
+ console_printf("0x%04x", uuid16);
return;
}
u8p = uuid128;
/* 00001101-0000-1000-8000-00805f9b34fb */
- BLETINY_LOG(INFO, "%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13],
- u8p[12]);
- BLETINY_LOG(INFO, "%02x%02x-%02x%02x-", u8p[11], u8p[10], u8p[9], u8p[8]);
- BLETINY_LOG(INFO, "%02x%02x%02x%02x%02x%02x%02x%02x",
- u8p[7], u8p[6], u8p[5], u8p[4],
- u8p[3], u8p[2], u8p[1], u8p[0]);
+ console_printf("%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13], u8p[12]);
+ console_printf("%02x%02x-%02x%02x-", u8p[11], u8p[10], u8p[9], u8p[8]);
+ console_printf("%02x%02x%02x%02x%02x%02x%02x%02x",
+ u8p[7], u8p[6], u8p[5], u8p[4],
+ u8p[3], u8p[2], u8p[1], u8p[0]);
}
int
parse_err_too_few_args(char *cmd_name)
{
- BLETINY_LOG(ERROR, "Error: too few arguments for command \"%s\"\n",
- cmd_name);
+ console_printf("Error: too few arguments for command \"%s\"\n",
+ cmd_name);
return -1;
}
@@ -373,12 +372,12 @@ parse_arg_all(int argc, char **argv)
if (key != NULL && val != NULL) {
if (strlen(key) == 0) {
- BLETINY_LOG(ERROR, "Error: invalid argument: %s\n", argv[i]);
+ console_printf("Error: invalid argument: %s\n", argv[i]);
return -1;
}
if (cmd_num_args >= CMD_MAX_ARGS) {
- BLETINY_LOG(ERROR, "Error: too many arguments");
+ console_printf("Error: too many arguments");
return -1;
}
[2/3] incubator-mynewt-core git commit: bletiny - Add "sec start"
command.
Posted by cc...@apache.org.
bletiny - Add "sec start" command.
This command initializes pairing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/7432082f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/7432082f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/7432082f
Branch: refs/heads/develop
Commit: 7432082fc125d48f7c34d34d83953d5a798b2f00
Parents: adb982f
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 4 20:18:18 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 4 20:18:18 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/bletiny_priv.h | 1 +
apps/bletiny/src/cmd.c | 42 ++++++++++++++++++++++++++++++++++++
apps/bletiny/src/main.c | 23 +++++++++++++++++++-
3 files changed, 65 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7432082f/apps/bletiny/src/bletiny_priv.h
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/bletiny_priv.h b/apps/bletiny/src/bletiny_priv.h
index e32251b..12551d7 100644
--- a/apps/bletiny/src/bletiny_priv.h
+++ b/apps/bletiny/src/bletiny_priv.h
@@ -161,6 +161,7 @@ void bletiny_chrup(uint16_t attr_handle);
int bletiny_l2cap_update(uint16_t conn_handle,
struct ble_l2cap_sig_update_params *params);
int bletiny_show_rssi(uint16_t conn_handle);
+int bletiny_sec_start(uint16_t conn_handle);
#define BLETINY_LOG_MODULE (LOG_MODULE_PERUSER + 0)
#define BLETINY_LOG(lvl, ...) \
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7432082f/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index b89e5e3..421d49a 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -884,6 +884,47 @@ cmd_show(int argc, char **argv)
}
/*****************************************************************************
+ * $sec *
+ *****************************************************************************/
+
+static int
+cmd_sec_start(int argc, char **argv)
+{
+ uint16_t conn_handle;
+ int rc;
+
+ conn_handle = parse_arg_uint16("conn", &rc);
+ if (rc != 0) {
+ return rc;
+ }
+
+ rc = bletiny_sec_start(conn_handle);
+ if (rc != 0) {
+ console_printf("error starting security; rc=%d\n", rc);
+ return rc;
+ }
+
+ return 0;
+}
+
+static struct cmd_entry cmd_sec_entries[] = {
+ { "start", cmd_sec_start },
+};
+
+static int
+cmd_sec(int argc, char **argv)
+{
+ int rc;
+
+ rc = cmd_exec(cmd_sec_entries, argc, argv);
+ if (rc != 0) {
+ return rc;
+ }
+
+ return 0;
+}
+
+/*****************************************************************************
* $set *
*****************************************************************************/
@@ -1436,6 +1477,7 @@ static struct cmd_entry cmd_b_entries[] = {
{ "read", cmd_read },
{ "scan", cmd_scan },
{ "show", cmd_show },
+ { "sec", cmd_sec },
{ "set", cmd_set },
{ "term", cmd_term },
{ "update", cmd_update },
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7432082f/apps/bletiny/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/main.c b/apps/bletiny/src/main.c
index 44815fc..17b4744 100755
--- a/apps/bletiny/src/main.c
+++ b/apps/bletiny/src/main.c
@@ -188,6 +188,13 @@ bletiny_print_conn_desc(struct ble_gap_conn_desc *desc)
}
static void
+bletiny_print_sec_params(struct ble_gap_sec_params *sec_params)
+{
+ console_printf("pair_alg=%d enc_enabled=%d\n", sec_params->pair_alg,
+ sec_params->enc_enabled);
+}
+
+static void
bletiny_print_adv_fields(struct ble_hs_adv_fields *fields)
{
uint32_t u32;
@@ -882,7 +889,7 @@ bletiny_on_notify(uint16_t conn_handle, uint16_t attr_handle,
static int
bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt,
- void *arg)
+ void *arg)
{
int conn_idx;
@@ -926,6 +933,11 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt,
console_printf("connection update request; status=%d ", status);
*ctxt->update.self_params = *ctxt->update.peer_params;
break;
+
+ case BLE_GAP_EVENT_SECURITY:
+ console_printf("security event; status=%d ", status);
+ bletiny_print_sec_params(ctxt->sec_params);
+ break;
}
bletiny_unlock();
@@ -1297,6 +1309,15 @@ bletiny_show_rssi(uint16_t conn_handle)
}
+int
+bletiny_sec_start(uint16_t conn_handle)
+{
+ int rc;
+
+ rc = ble_gap_security_initiate(conn_handle);
+ return rc;
+}
+
/**
* BLE test task
*
[3/3] incubator-mynewt-core git commit: ble host - fix bug: ensure
proc inserted.
Posted by cc...@apache.org.
ble host - fix bug: ensure proc inserted.
This bug occurred when the application task is running at a lower
priority than the host task. When the application initiates pairing,
the host code kicked the host task before the pairing operation was
inserted into the procedure list. As a consequence, the pairing
procedure did not execute.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/1f4662b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/1f4662b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/1f4662b1
Branch: refs/heads/develop
Commit: 1f4662b1e9d3dcfed4a8db3de2b5ce02b280399f
Parents: 7432082
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 4 20:19:07 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 4 20:19:07 2016 -0700
----------------------------------------------------------------------
net/nimble/host/src/ble_l2cap_sm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/1f4662b1/net/nimble/host/src/ble_l2cap_sm.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_l2cap_sm.c b/net/nimble/host/src/ble_l2cap_sm.c
index 3c8b0f6..06b0925 100644
--- a/net/nimble/host/src/ble_l2cap_sm.c
+++ b/net/nimble/host/src/ble_l2cap_sm.c
@@ -1105,7 +1105,8 @@ ble_l2cap_sm_rx_start_encrypt_ack(struct ble_hci_ack *ack, void *arg)
proc = arg;
- BLE_HS_DBG_ASSERT(proc->fsm_proc.op == BLE_L2CAP_SM_PROC_OP_START_ENCRYPT_TXED);
+ BLE_HS_DBG_ASSERT(proc->fsm_proc.op ==
+ BLE_L2CAP_SM_PROC_OP_START_ENCRYPT_TXED);
/* Extract the procedure from the state machine while we mess with it. */
ble_fsm_lock(&ble_l2cap_sm_fsm);
@@ -1222,8 +1223,8 @@ ble_l2cap_sm_initiate(uint16_t conn_handle)
}
proc->flags |= BLE_L2CAP_SM_PROC_F_INITIATOR;
- ble_l2cap_sm_proc_set_pending(proc);
STAILQ_INSERT_TAIL(&ble_l2cap_sm_fsm.procs, &proc->fsm_proc, next);
+ ble_l2cap_sm_proc_set_pending(proc);
return 0;
}