Repository: incubator-mynewt-larva Updated Branches: refs/heads/master de3c1e3db -> a32bbd5cd
bletiny - remove "tiny" identity; use ERROR/INFO. Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/a32bbd5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/a32bbd5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/a32bbd5c Branch: refs/heads/master Commit: a32bbd5cd50e3e0be17702afa5677c1f8321db32 Parents: de3c1e3 Author: Christopher Collins <ccollins47...@gmail.com> Authored: Thu Feb 11 17:21:01 2016 -0800 Committer: Christopher Collins <ccollins47...@gmail.com> Committed: Thu Feb 11 17:21:01 2016 -0800 ---------------------------------------------------------------------- .gitignore | 1 + project/bletiny/bletiny.yml | 1 - project/bletiny/src/cmd.c | 70 ++++++++--------- project/bletiny/src/main.c | 164 +++++++++++++++++++-------------------- project/bletiny/src/parse.c | 16 ++-- 5 files changed, 125 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a32bbd5c/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 6711bcb..5d22f6c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ obj tags .gdb_history .gdb_out +.gdb_cmds *~ .DS_Store *.swp http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a32bbd5c/project/bletiny/bletiny.yml ---------------------------------------------------------------------- diff --git a/project/bletiny/bletiny.yml b/project/bletiny/bletiny.yml index a223f03..4adef49 100644 --- a/project/bletiny/bletiny.yml +++ b/project/bletiny/bletiny.yml @@ -18,7 +18,6 @@ # project.name: bletiny -project.identities: tiny project.pkgs: - libs/os - sys/log http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a32bbd5c/project/bletiny/src/cmd.c ---------------------------------------------------------------------- diff --git a/project/bletiny/src/cmd.c b/project/bletiny/src/cmd.c index 907632a..28e1c7d 100644 --- a/project/bletiny/src/cmd.c +++ b/project/bletiny/src/cmd.c @@ -53,7 +53,7 @@ cmd_exec(const struct cmd_entry *cmds, int argc, char **argv) cmd = parse_cmd_find(cmds, argv[1]); if (cmd == NULL) { - BLETINY_LOG(DEBUG, "Error: unknown %s command: %s\n", + BLETINY_LOG(ERROR, "Error: unknown %s command: %s\n", argv[0], argv[1]); return -1; } @@ -69,9 +69,9 @@ cmd_exec(const struct cmd_entry *cmds, int argc, char **argv) static void cmd_print_dsc(struct bletiny_dsc *dsc) { - BLETINY_LOG(DEBUG, " dsc_handle=%d uuid=", dsc->dsc.handle); + BLETINY_LOG(INFO, " dsc_handle=%d uuid=", dsc->dsc.handle); print_uuid(dsc->dsc.uuid128); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } static void @@ -79,11 +79,11 @@ cmd_print_chr(struct bletiny_chr *chr) { struct bletiny_dsc *dsc; - BLETINY_LOG(DEBUG, " def_handle=%d val_handle=%d properties=0x%02x " - "uuid=", chr->chr.decl_handle, chr->chr.value_handle, + BLETINY_LOG(INFO, " 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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); SLIST_FOREACH(dsc, &chr->dscs, next) { cmd_print_dsc(dsc); @@ -95,10 +95,10 @@ cmd_print_svc(struct bletiny_svc *svc, int print_chrs) { struct bletiny_chr *chr; - BLETINY_LOG(DEBUG, " start=%d end=%d uuid=", svc->svc.start_handle, + BLETINY_LOG(INFO, " start=%d end=%d uuid=", svc->svc.start_handle, svc->svc.end_handle); print_uuid(svc->svc.uuid128); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); if (print_chrs) { SLIST_FOREACH(chr, &svc->chrs, next) { @@ -184,7 +184,7 @@ cmd_adv(int argc, char **argv) if (argc > 1 && strcmp(argv[1], "stop") == 0) { rc = bletiny_adv_stop(); if (rc != 0) { - BLETINY_LOG(DEBUG, "advertise stop fail: %d\n", rc); + BLETINY_LOG(INFO, "advertise stop fail: %d\n", rc); return rc; } @@ -193,13 +193,13 @@ cmd_adv(int argc, char **argv) conn = parse_arg_kv("conn", cmd_adv_conn_modes); if (conn == -1) { - BLETINY_LOG(DEBUG, "invalid 'conn' parameter\n"); + BLETINY_LOG(ERROR, "invalid 'conn' parameter\n"); return -1; } disc = parse_arg_kv("disc", cmd_adv_disc_modes); if (disc == -1) { - BLETINY_LOG(DEBUG, "missing 'disc' parameter\n"); + BLETINY_LOG(ERROR, "missing 'disc' parameter\n"); return -1; } @@ -234,7 +234,7 @@ cmd_adv(int argc, char **argv) rc = bletiny_adv_start(disc, conn, peer_addr, addr_type, ¶ms); if (rc != 0) { - BLETINY_LOG(DEBUG, "advertise fail: %d\n", rc); + BLETINY_LOG(INFO, "advertise fail: %d\n", rc); return rc; } @@ -265,7 +265,7 @@ cmd_conn(int argc, char **argv) if (argc > 1 && strcmp(argv[1], "cancel") == 0) { rc = bletiny_conn_cancel(); if (rc != 0) { - BLETINY_LOG(DEBUG, "connection cancel fail: %d\n", rc); + BLETINY_LOG(INFO, "connection cancel fail: %d\n", rc); return rc; } @@ -384,7 +384,7 @@ cmd_disc_chr(int argc, char **argv) return rc; } if (rc != 0) { - BLETINY_LOG(DEBUG, "error discovering characteristics; rc=%d\n", rc); + BLETINY_LOG(INFO, "error discovering characteristics; rc=%d\n", rc); return rc; } @@ -406,7 +406,7 @@ cmd_disc_dsc(int argc, char **argv) rc = bletiny_disc_all_dscs(conn_handle, start_handle, end_handle); if (rc != 0) { - BLETINY_LOG(DEBUG, "error discovering descriptors; rc=%d\n", rc); + BLETINY_LOG(INFO, "error discovering descriptors; rc=%d\n", rc); return rc; } @@ -435,7 +435,7 @@ cmd_disc_svc(int argc, char **argv) } if (rc != 0) { - BLETINY_LOG(DEBUG, "error discovering services; rc=%d\n", rc); + BLETINY_LOG(INFO, "error discovering services; rc=%d\n", rc); return rc; } @@ -481,7 +481,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(DEBUG, "error finding included services; rc=%d\n", rc); + BLETINY_LOG(INFO, "error finding included services; rc=%d\n", rc); return rc; } @@ -546,7 +546,7 @@ cmd_l2cap_update(int argc, char **argv) rc = bletiny_l2cap_update(conn_handle, ¶ms); if (rc != 0) { - BLETINY_LOG(DEBUG, "error txing l2cap update; rc=%d\n", rc); + BLETINY_LOG(INFO, "error txing l2cap update; rc=%d\n", rc); return rc; } @@ -588,7 +588,7 @@ cmd_mtu(int argc, char **argv) rc = bletiny_exchange_mtu(conn_handle); if (rc != 0) { - BLETINY_LOG(DEBUG, "error exchanging mtu; rc=%d\n", rc); + BLETINY_LOG(INFO, "error exchanging mtu; rc=%d\n", rc); return rc; } @@ -680,7 +680,7 @@ cmd_read(int argc, char **argv) } if (rc != 0) { - BLETINY_LOG(DEBUG, "error reading characteristic; rc=%d\n", rc); + BLETINY_LOG(INFO, "error reading characteristic; rc=%d\n", rc); return rc; } @@ -742,7 +742,7 @@ cmd_scan(int argc, char **argv) rc = bletiny_scan(dur, disc, type, filt); if (rc != 0) { - BLETINY_LOG(DEBUG, "error scanning; rc=%d\n", rc); + BLETINY_LOG(INFO, "error scanning; rc=%d\n", rc); return rc; } @@ -758,9 +758,9 @@ cmd_show_addr(int argc, char **argv) { bletiny_lock(); - BLETINY_LOG(DEBUG, "myaddr="); + BLETINY_LOG(INFO, "myaddr="); print_addr(g_dev_addr); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); bletiny_unlock(); @@ -779,9 +779,9 @@ cmd_show_chr(int argc, char **argv) for (i = 0; i < bletiny_num_conns; i++) { conn = bletiny_conns + i; - BLETINY_LOG(DEBUG, "CONNECTION: handle=%d addr=", conn->handle); + BLETINY_LOG(INFO, "CONNECTION: handle=%d addr=", conn->handle); print_addr(conn->addr); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); SLIST_FOREACH(svc, &conn->svcs, next) { cmd_print_svc(svc, 1); @@ -804,9 +804,9 @@ cmd_show_conn(int argc, char **argv) for (i = 0; i < bletiny_num_conns; i++) { conn = bletiny_conns + i; - BLETINY_LOG(DEBUG, "handle=%d addr=", conn->handle); + BLETINY_LOG(INFO, "handle=%d addr=", conn->handle); print_addr(conn->addr); - BLETINY_LOG(DEBUG, " addr_type=%d\n", conn->addr_type); + BLETINY_LOG(INFO, " addr_type=%d\n", conn->addr_type); } bletiny_unlock(); @@ -845,9 +845,9 @@ cmd_show_svc(int argc, char **argv) for (i = 0; i < bletiny_num_conns; i++) { conn = bletiny_conns + i; - BLETINY_LOG(DEBUG, "CONNECTION: handle=%d addr=", conn->handle); + BLETINY_LOG(INFO, "CONNECTION: handle=%d addr=", conn->handle); print_addr(conn->addr); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); SLIST_FOREACH(svc, &conn->svcs, next) { cmd_print_svc(svc, 0); @@ -1136,7 +1136,7 @@ cmd_set_adv_data(void) rc = bletiny_set_adv_data(&adv_fields); if (rc != 0) { - BLETINY_LOG(DEBUG, "error setting advertisement data; rc=%d\n", rc); + BLETINY_LOG(INFO, "error setting advertisement data; rc=%d\n", rc); return rc; } @@ -1177,7 +1177,7 @@ cmd_set(int argc, char **argv) } if (!good) { - BLETINY_LOG(DEBUG, "Error: no valid settings specified\n"); + BLETINY_LOG(ERROR, "Error: no valid settings specified\n"); return -1; } @@ -1201,7 +1201,7 @@ cmd_term(int argc, char **argv) rc = bletiny_term_conn(conn_handle); if (rc != 0) { - BLETINY_LOG(DEBUG, "error terminating connection; rc=%d\n", rc); + BLETINY_LOG(INFO, "error terminating connection; rc=%d\n", rc); return rc; } @@ -1258,7 +1258,7 @@ cmd_update(int argc, char **argv) rc = bletiny_update_conn(conn_handle, ¶ms); if (rc != 0) { - BLETINY_LOG(DEBUG, "error updating connection; rc=%d\n", rc); + BLETINY_LOG(INFO, "error updating connection; rc=%d\n", rc); return rc; } @@ -1409,7 +1409,7 @@ cmd_write(int argc, char **argv) } if (rc != 0) { - BLETINY_LOG(DEBUG, "error writing characteristic; rc=%d\n", rc); + BLETINY_LOG(INFO, "error writing characteristic; rc=%d\n", rc); return rc; } @@ -1451,7 +1451,7 @@ cmd_b_exec(int argc, char **argv) rc = cmd_exec(cmd_b_entries, argc, argv); if (rc != 0) { - BLETINY_LOG(DEBUG, "error\n"); + BLETINY_LOG(ERROR, "error\n"); goto done; } http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a32bbd5c/project/bletiny/src/main.c ---------------------------------------------------------------------- diff --git a/project/bletiny/src/main.c b/project/bletiny/src/main.c index 252693f..844e445 100755 --- a/project/bletiny/src/main.c +++ b/project/bletiny/src/main.c @@ -150,7 +150,7 @@ static void bletiny_print_error(char *msg, uint16_t conn_handle, struct ble_gatt_error *error) { - BLETINY_LOG(DEBUG, "%s: conn_handle=%d status=%d att_handle=%d\n", + BLETINY_LOG(INFO, "%s: conn_handle=%d status=%d att_handle=%d\n", msg, conn_handle, error->status, error->att_handle); } @@ -160,17 +160,17 @@ bletiny_print_bytes(uint8_t *bytes, int len) int i; for (i = 0; i < len; i++) { - BLETINY_LOG(DEBUG, "%s0x%02x", i != 0 ? ":" : "", bytes[i]); + BLETINY_LOG(INFO, "%s0x%02x", i != 0 ? ":" : "", bytes[i]); } } static void bletiny_print_conn_desc(struct ble_gap_conn_desc *desc) { - BLETINY_LOG(DEBUG, "handle=%d peer_addr_type=%d peer_addr=", + BLETINY_LOG(INFO, "handle=%d peer_addr_type=%d peer_addr=", desc->conn_handle, desc->peer_addr_type); bletiny_print_bytes(desc->peer_addr, 6); - BLETINY_LOG(DEBUG, " conn_itvl=%d conn_latency=%d supervision_timeout=%d", + BLETINY_LOG(INFO, " conn_itvl=%d conn_latency=%d supervision_timeout=%d", desc->conn_itvl, desc->conn_latency, desc->supervision_timeout); } @@ -184,126 +184,126 @@ bletiny_print_adv_fields(struct ble_hs_adv_fields *fields) int i; if (fields->flags_is_present) { - BLETINY_LOG(DEBUG, " flags=0x%02x\n", fields->flags); + BLETINY_LOG(INFO, " flags=0x%02x\n", fields->flags); } if (fields->uuids16 != NULL) { - BLETINY_LOG(DEBUG, " uuids16(%scomplete)=", + BLETINY_LOG(INFO, " 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(DEBUG, "0x%04x ", u16); + BLETINY_LOG(INFO, "0x%04x ", u16); } - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->uuids32 != NULL) { - BLETINY_LOG(DEBUG, " uuids32(%scomplete)=", + BLETINY_LOG(INFO, " 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(DEBUG, "0x%08x ", (unsigned)u32); + BLETINY_LOG(INFO, "0x%08x ", (unsigned)u32); } - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->uuids128 != NULL) { - BLETINY_LOG(DEBUG, " uuids128(%scomplete)=", + BLETINY_LOG(INFO, " uuids128(%scomplete)=", fields->uuids128_is_complete ? "" : "in"); u8p = fields->uuids128; for (i = 0; i < fields->num_uuids128; i++) { print_uuid(u8p); - BLETINY_LOG(DEBUG, " "); + BLETINY_LOG(INFO, " "); u8p += 16; } - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->name != NULL) { - BLETINY_LOG(DEBUG, " name(%scomplete)=", + BLETINY_LOG(INFO, " name(%scomplete)=", fields->name_is_complete ? "" : "in"); - BLETINY_LOG(DEBUG, "%*s\n", fields->name_len, fields->name); + BLETINY_LOG(INFO, "%*s\n", fields->name_len, fields->name); } if (fields->tx_pwr_lvl_is_present) { - BLETINY_LOG(DEBUG, " tx_pwr_lvl=%d\n", fields->tx_pwr_lvl); + BLETINY_LOG(INFO, " tx_pwr_lvl=%d\n", fields->tx_pwr_lvl); } if (fields->device_class != NULL) { - BLETINY_LOG(DEBUG, " device_class="); + BLETINY_LOG(INFO, " device_class="); bletiny_print_bytes(fields->device_class, BLE_HS_ADV_DEVICE_CLASS_LEN); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->slave_itvl_range != NULL) { - BLETINY_LOG(DEBUG, " slave_itvl_range="); + BLETINY_LOG(INFO, " slave_itvl_range="); bletiny_print_bytes(fields->slave_itvl_range, BLE_HS_ADV_SLAVE_ITVL_RANGE_LEN); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->svc_data_uuid16 != NULL) { - BLETINY_LOG(DEBUG, " svc_data_uuid16="); + BLETINY_LOG(INFO, " svc_data_uuid16="); bletiny_print_bytes(fields->svc_data_uuid16, fields->svc_data_uuid16_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->public_tgt_addr != NULL) { - BLETINY_LOG(DEBUG, " public_tgt_addr="); + BLETINY_LOG(INFO, " 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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->appearance_is_present) { - BLETINY_LOG(DEBUG, " appearance=0x%04x\n", fields->appearance); + BLETINY_LOG(INFO, " appearance=0x%04x\n", fields->appearance); } if (fields->adv_itvl_is_present) { - BLETINY_LOG(DEBUG, " adv_itvl=0x%04x\n", fields->adv_itvl); + BLETINY_LOG(INFO, " adv_itvl=0x%04x\n", fields->adv_itvl); } if (fields->le_addr != NULL) { - BLETINY_LOG(DEBUG, " le_addr="); + BLETINY_LOG(INFO, " le_addr="); bletiny_print_bytes(fields->le_addr, BLE_HS_ADV_LE_ADDR_LEN); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->le_role_is_present) { - BLETINY_LOG(DEBUG, " le_role=0x%02x\n", fields->le_role); + BLETINY_LOG(INFO, " le_role=0x%02x\n", fields->le_role); } if (fields->svc_data_uuid32 != NULL) { - BLETINY_LOG(DEBUG, " svc_data_uuid32="); + BLETINY_LOG(INFO, " svc_data_uuid32="); bletiny_print_bytes(fields->svc_data_uuid32, fields->svc_data_uuid32_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->svc_data_uuid128 != NULL) { - BLETINY_LOG(DEBUG, " svc_data_uuid128="); + BLETINY_LOG(INFO, " svc_data_uuid128="); bletiny_print_bytes(fields->svc_data_uuid128, fields->svc_data_uuid128_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->uri != NULL) { - BLETINY_LOG(DEBUG, " uri="); + BLETINY_LOG(INFO, " uri="); bletiny_print_bytes(fields->uri, fields->uri_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } if (fields->mfg_data != NULL) { - BLETINY_LOG(DEBUG, " mfg_data="); + BLETINY_LOG(INFO, " mfg_data="); bletiny_print_bytes(fields->mfg_data, fields->mfg_data_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } } @@ -446,7 +446,7 @@ bletiny_svc_add(uint16_t conn_handle, struct ble_gatt_service *gatt_svc) conn = bletiny_conn_find(conn_handle); if (conn == NULL) { - BLETINY_LOG(DEBUG, + BLETINY_LOG(INFO, "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n", conn_handle); return NULL; @@ -460,7 +460,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(DEBUG, "OOM WHILE DISCOVERING SERVICE\n"); + BLETINY_LOG(INFO, "OOM WHILE DISCOVERING SERVICE\n"); return NULL; } memset(svc, 0, sizeof *svc); @@ -531,7 +531,7 @@ bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle, conn = bletiny_conn_find(conn_handle); if (conn == NULL) { - BLETINY_LOG(DEBUG, + BLETINY_LOG(INFO, "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n", conn_handle); return NULL; @@ -539,7 +539,7 @@ bletiny_chr_add(uint16_t conn_handle, uint16_t svc_start_handle, svc = bletiny_svc_find(conn, svc_start_handle, NULL); if (svc == NULL) { - BLETINY_LOG(DEBUG, + BLETINY_LOG(INFO, "CAN'T FIND SERVICE FOR DISCOVERED CHR; HANDLE=%d\n", conn_handle); return NULL; @@ -553,7 +553,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(DEBUG, "OOM WHILE DISCOVERING CHARACTERISTIC\n"); + BLETINY_LOG(INFO, "OOM WHILE DISCOVERING CHARACTERISTIC\n"); return NULL; } memset(chr, 0, sizeof *chr); @@ -623,7 +623,7 @@ bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle, conn = bletiny_conn_find(conn_handle); if (conn == NULL) { - BLETINY_LOG(DEBUG, + BLETINY_LOG(INFO, "RECEIVED SERVICE FOR UNKNOWN CONNECTION; HANDLE=%d\n", conn_handle); return NULL; @@ -631,7 +631,7 @@ bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle, svc = bletiny_svc_find_range(conn, chr_def_handle); if (svc == NULL) { - BLETINY_LOG(DEBUG, + BLETINY_LOG(INFO, "CAN'T FIND SERVICE FOR DISCOVERED DSC; HANDLE=%d\n", conn_handle); return NULL; @@ -639,7 +639,7 @@ bletiny_dsc_add(uint16_t conn_handle, uint16_t chr_def_handle, chr = bletiny_chr_find(svc, chr_def_handle, NULL); if (chr == NULL) { - BLETINY_LOG(DEBUG, "CAN'T FIND CHARACTERISTIC FOR DISCOVERED DSC; " + BLETINY_LOG(INFO, "CAN'T FIND CHARACTERISTIC FOR DISCOVERED DSC; " "HANDLE=%d\n", conn_handle); return NULL; } @@ -652,7 +652,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(DEBUG, "OOM WHILE DISCOVERING DESCRIPTOR\n"); + BLETINY_LOG(INFO, "OOM WHILE DISCOVERING DESCRIPTOR\n"); return NULL; } memset(dsc, 0, sizeof *dsc); @@ -702,7 +702,7 @@ 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(DEBUG, "mtu exchange complete: conn_handle=%d mtu=%d\n", + BLETINY_LOG(INFO, "mtu exchange complete: conn_handle=%d mtu=%d\n", conn_handle, mtu); } @@ -720,7 +720,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 { - /* Service discovery complete. */ + BLETINY_LOG(INFO, "service discovery successful\n"); } bletiny_unlock(); @@ -734,21 +734,19 @@ bletiny_on_disc_c(uint16_t conn_handle, struct ble_gatt_error *error, { intptr_t svc_start_handle; - bletiny_lock(); - svc_start_handle = (intptr_t)arg; if (error != NULL) { bletiny_print_error("ERROR DISCOVERING CHARACTERISTIC", conn_handle, error); } else if (chr != NULL) { + bletiny_lock(); bletiny_chr_add(conn_handle, svc_start_handle, chr); + bletiny_unlock(); } else { - /* Service discovery complete. */ + BLETINY_LOG(INFO, "characteristic discovery successful\n"); } - bletiny_unlock(); - return 0; } @@ -765,7 +763,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 { - /* Descriptor discovery complete. */ + BLETINY_LOG(INFO, "descriptor discovery successful\n"); } bletiny_unlock(); @@ -781,13 +779,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(DEBUG, "characteristic read; conn_handle=%d " + BLETINY_LOG(INFO, "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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } else { - BLETINY_LOG(DEBUG, "characteristic read complete\n"); + BLETINY_LOG(INFO, "characteristic read complete\n"); } return 0; @@ -804,16 +802,16 @@ 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(DEBUG, + BLETINY_LOG(INFO, "multiple characteristic read complete; conn_handle=%d " "attr_handles=", conn_handle); for (i = 0; i < num_attr_handles; i++) { - BLETINY_LOG(DEBUG, "%s%d", i != 0 ? "," : "", attr_handles[i]); + BLETINY_LOG(INFO, "%s%d", i != 0 ? "," : "", attr_handles[i]); } - BLETINY_LOG(DEBUG, " len=%d value=", attr_data_len); + BLETINY_LOG(INFO, " len=%d value=", attr_data_len); bletiny_print_bytes(attr_data, attr_data_len); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } return 0; @@ -828,11 +826,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(DEBUG, "characteristic write complete; conn_handle=%d " + BLETINY_LOG(INFO, "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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } return 0; @@ -849,15 +847,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(DEBUG, "characteristic write reliable complete; " + BLETINY_LOG(INFO, "characteristic write reliable complete; " "conn_handle=%d", conn_handle); for (i = 0; i < num_attrs; i++) { - BLETINY_LOG(DEBUG, " attr_handle=%d len=%d value=", attrs[i].handle, + BLETINY_LOG(INFO, " 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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); } return 0; @@ -867,11 +865,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(DEBUG, "received notification from conn_handle=%d attr=%d " + BLETINY_LOG(INFO, "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(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); return 0; } @@ -886,22 +884,22 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt, switch (event) { case BLE_GAP_EVENT_CONN: - BLETINY_LOG(DEBUG, "connection %s; status=%d ", + BLETINY_LOG(INFO, "connection %s; status=%d ", status == 0 ? "up" : "down", status); bletiny_print_conn_desc(ctxt->desc); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\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(DEBUG, "connection procedure cancelled.\n"); + BLETINY_LOG(INFO, "connection procedure cancelled.\n"); } } else { conn_idx = bletiny_conn_find_idx(ctxt->desc->conn_handle); if (conn_idx == -1) { - BLETINY_LOG(DEBUG, "UNKNOWN CONNECTION\n"); + BLETINY_LOG(INFO, "UNKNOWN CONNECTION\n"); } else { bletiny_conn_delete_idx(conn_idx); } @@ -913,13 +911,13 @@ bletiny_on_connect(int event, int status, struct ble_gap_conn_ctxt *ctxt, break; case BLE_GAP_EVENT_CONN_UPDATED: - BLETINY_LOG(DEBUG, "connection updated; status=%d ", status); + BLETINY_LOG(INFO, "connection updated; status=%d ", status); bletiny_print_conn_desc(ctxt->desc); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); break; case BLE_GAP_EVENT_CONN_UPDATE_REQ: - BLETINY_LOG(DEBUG, "connection update request; status=%d ", status); + BLETINY_LOG(INFO, "connection update request; status=%d ", status); *ctxt->self_params = *ctxt->peer_params; break; } @@ -932,13 +930,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(DEBUG, "l2cap update complete; status=%d\n", status); + BLETINY_LOG(INFO, "l2cap update complete; status=%d\n", status); } static void bletiny_on_wl_set(int status, void *arg) { - BLETINY_LOG(DEBUG, "white list set status=%d\n", status); + BLETINY_LOG(INFO, "white list set status=%d\n", status); } static void @@ -947,19 +945,19 @@ bletiny_on_scan(int event, int status, struct ble_gap_disc_desc *desc, { switch (event) { case BLE_GAP_EVENT_DISC_SUCCESS: - BLETINY_LOG(DEBUG, "received advertisement; event_type=%d addr_type=%d " + BLETINY_LOG(INFO, "received advertisement; event_type=%d addr_type=%d " "addr=", desc->event_type, desc->addr_type); bletiny_print_bytes(desc->addr, 6); - BLETINY_LOG(DEBUG, " length_data=%d rssi=%d data=", desc->length_data, + BLETINY_LOG(INFO, " length_data=%d rssi=%d data=", desc->length_data, desc->rssi); bletiny_print_bytes(desc->data, desc->length_data); - BLETINY_LOG(DEBUG, " fields:\n"); + BLETINY_LOG(INFO, " fields:\n"); bletiny_print_adv_fields(desc->fields); - BLETINY_LOG(DEBUG, "\n"); + BLETINY_LOG(INFO, "\n"); break; case BLE_GAP_EVENT_DISC_FINISHED: - BLETINY_LOG(DEBUG, "scanning finished; status=%d\n", status); + BLETINY_LOG(INFO, "scanning finished; status=%d\n", status); break; default: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/a32bbd5c/project/bletiny/src/parse.c ---------------------------------------------------------------------- diff --git a/project/bletiny/src/parse.c b/project/bletiny/src/parse.c index d1c1f95..8051a88 100644 --- a/project/bletiny/src/parse.c +++ b/project/bletiny/src/parse.c @@ -38,7 +38,7 @@ print_addr(void *addr) uint8_t *u8p; u8p = addr; - BLETINY_LOG(DEBUG, "%02x:%02x:%02x:%02x:%02x:%02x", + BLETINY_LOG(INFO, "%02x:%02x:%02x:%02x:%02x:%02x", u8p[5], u8p[4], u8p[3], u8p[2], u8p[1], u8p[0]); } @@ -50,17 +50,17 @@ print_uuid(void *uuid128) uuid16 = ble_uuid_128_to_16(uuid128); if (uuid16 != 0) { - BLETINY_LOG(DEBUG, "0x%04x", uuid16); + BLETINY_LOG(INFO, "0x%04x", uuid16); return; } u8p = uuid128; /* 00001101-0000-1000-8000-00805f9b34fb */ - BLETINY_LOG(DEBUG, "%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13], + BLETINY_LOG(INFO, "%02x%02x%02x%02x-", u8p[15], u8p[14], u8p[13], u8p[12]); - BLETINY_LOG(DEBUG, "%02x%02x-%02x%02x-", u8p[11], u8p[10], u8p[9], u8p[8]); - BLETINY_LOG(DEBUG, "%02x%02x%02x%02x%02x%02x%02x%02x", + 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]); } @@ -68,7 +68,7 @@ print_uuid(void *uuid128) int parse_err_too_few_args(char *cmd_name) { - BLETINY_LOG(DEBUG, "Error: too few arguments for command \"%s\"\n", + BLETINY_LOG(ERROR, "Error: too few arguments for command \"%s\"\n", cmd_name); return -1; } @@ -415,12 +415,12 @@ parse_arg_all(int argc, char **argv) if (key != NULL && val != NULL) { if (strlen(key) == 0) { - BLETINY_LOG(DEBUG, "Error: invalid argument: %s\n", argv[i]); + BLETINY_LOG(ERROR, "Error: invalid argument: %s\n", argv[i]); return -1; } if (cmd_num_args >= CMD_MAX_ARGS) { - BLETINY_LOG(DEBUG, "Error: too many arguments"); + BLETINY_LOG(ERROR, "Error: too many arguments"); return -1; }
