From a0e4eb7ca836c1133c22c99d124652bd206dc3fc Mon Sep 17 00:00:00 2001 From: "matthias.ringwald@gmail.com" Date: Thu, 4 Sep 2014 10:07:00 +0000 Subject: [PATCH] dump received RFCOMM data as text, use only \n instead of \n\r --- example/libusb/spp_and_le_counter.c | 28 +++++++++++++++-------- example/libusb/spp_counter.c | 35 +++++++++++++++++++---------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/example/libusb/spp_and_le_counter.c b/example/libusb/spp_and_le_counter.c index adab8390c..e23d024fa 100644 --- a/example/libusb/spp_and_le_counter.c +++ b/example/libusb/spp_and_le_counter.c @@ -94,7 +94,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha bd_addr_t event_addr; uint8_t rfcomm_channel_nr; uint16_t mtu; - + int i; + switch (packet_type) { case HCI_EVENT_PACKET: switch (packet[0]) { @@ -109,7 +110,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha case HCI_EVENT_PIN_CODE_REQUEST: // inform about pin code request - printf("Pin code request - using '0000'\n\r"); + printf("Pin code request - using '0000'\n"); bt_flip_addr(event_addr, &packet[2]); hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000"); break; @@ -131,22 +132,23 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha bt_flip_addr(event_addr, &packet[2]); rfcomm_channel_nr = packet[8]; rfcomm_channel_id = READ_BT_16(packet, 9); - printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); + printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr)); rfcomm_accept_connection_internal(rfcomm_channel_id); break; case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: // data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16) if (packet[2]) { - printf("RFCOMM channel open failed, status %u\n\r", packet[2]); + printf("RFCOMM channel open failed, status %u\n", packet[2]); } else { rfcomm_channel_id = READ_BT_16(packet, 12); mtu = READ_BT_16(packet, 14); - printf("\n\rRFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n\r", rfcomm_channel_id, mtu); + printf("\nRFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n", rfcomm_channel_id, mtu); } break; case RFCOMM_EVENT_CHANNEL_CLOSED: + printf("RFCOMM channel closed\n"); rfcomm_channel_id = 0; break; @@ -155,6 +157,14 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha } break; + case RFCOMM_DATA_PACKET: + printf("RCV: '"); + for (i=0;iservice_record, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - // printf("SDP service buffer size: %u\n\r", (uint16_t) (sizeof(service_record_item_t) + de_get_len((uint8_t*) &service_record_item->service_record))); + // printf("SDP service buffer size: %u\n", (uint16_t) (sizeof(service_record_item_t) + de_get_len((uint8_t*) &service_record_item->service_record))); // sdp_register_service_internal(NULL, service_record_item); sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - printf("SDP service record size: %u\n\r", de_get_len(spp_service_buffer)); + printf("SDP service record size: %u\n", de_get_len(spp_service_buffer)); sdp_register_service_internal(NULL, spp_service_buffer); hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO); diff --git a/example/libusb/spp_counter.c b/example/libusb/spp_counter.c index 0946b9f49..0fbd9e0a8 100644 --- a/example/libusb/spp_counter.c +++ b/example/libusb/spp_counter.c @@ -36,7 +36,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha bd_addr_t event_addr; uint8_t rfcomm_channel_nr; uint16_t mtu; - + int i; + switch (packet_type) { case HCI_EVENT_PACKET: switch (packet[0]) { @@ -51,14 +52,14 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha case HCI_EVENT_COMMAND_COMPLETE: if (COMMAND_COMPLETE_EVENT(packet, hci_read_bd_addr)){ bt_flip_addr(event_addr, &packet[6]); - printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr)); + printf("BD-ADDR: %s\n", bd_addr_to_str(event_addr)); break; } break; case HCI_EVENT_PIN_CODE_REQUEST: // inform about pin code request - printf("Pin code request - using '0000'\n\r"); + printf("Pin code request - using '0000'\n"); bt_flip_addr(event_addr, &packet[2]); hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000"); break; @@ -75,22 +76,23 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha bt_flip_addr(event_addr, &packet[2]); rfcomm_channel_nr = packet[8]; rfcomm_channel_id = READ_BT_16(packet, 9); - printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); + printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr)); rfcomm_accept_connection_internal(rfcomm_channel_id); break; case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: // data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16) if (packet[2]) { - printf("RFCOMM channel open failed, status %u\n\r", packet[2]); + printf("RFCOMM channel open failed, status %u\n", packet[2]); } else { rfcomm_channel_id = READ_BT_16(packet, 12); mtu = READ_BT_16(packet, 14); - printf("\n\rRFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n\r", rfcomm_channel_id, mtu); + printf("RFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n", rfcomm_channel_id, mtu); } break; case RFCOMM_EVENT_CHANNEL_CLOSED: + printf("RFCOMM channel closed\n"); rfcomm_channel_id = 0; break; @@ -98,7 +100,15 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha break; } break; - + + case RFCOMM_DATA_PACKET: + printf("RCV: '"); + for (i=0;i error 0X%02x", err); @@ -150,10 +161,10 @@ void setup(void){ memset(spp_service_buffer, 0, sizeof(spp_service_buffer)); // service_record_item_t * service_record_item = (service_record_item_t *) spp_service_buffer; // sdp_create_spp_service( (uint8_t*) &service_record_item->service_record, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - // printf("SDP service buffer size: %u\n\r", (uint16_t) (sizeof(service_record_item_t) + de_get_len((uint8_t*) &service_record_item->service_record))); + // printf("SDP service buffer size: %u\n", (uint16_t) (sizeof(service_record_item_t) + de_get_len((uint8_t*) &service_record_item->service_record))); // sdp_register_service_internal(NULL, service_record_item); sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); - printf("SDP service record size: %u\n\r", de_get_len(spp_service_buffer)); + printf("SDP service record size: %u\n", de_get_len(spp_service_buffer)); sdp_register_service_internal(NULL, spp_service_buffer); hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO);