mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-25 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

dump received RFCOMM data as text, use only \n instead of \n\r

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-09-04 10:07:00 +00:00
parent f59d59529d
commit a0e4eb7ca8
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
example/libusb/spp_and_le_counter.c
View File

@ -94,6 +94,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
bd_addr_t event_addr; bd_addr_t event_addr;
uint8_t rfcomm_channel_nr; uint8_t rfcomm_channel_nr;
uint16_t mtu; uint16_t mtu;
int i;
switch (packet_type) { switch (packet_type) {
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
@ -109,7 +110,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
case HCI_EVENT_PIN_CODE_REQUEST: case HCI_EVENT_PIN_CODE_REQUEST:
// inform about 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]); bt_flip_addr(event_addr, &packet[2]);
hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000"); hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
break; 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]); bt_flip_addr(event_addr, &packet[2]);
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); 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); rfcomm_accept_connection_internal(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: 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) // data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16)
if (packet[2]) { 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 { } else {
rfcomm_channel_id = READ_BT_16(packet, 12); rfcomm_channel_id = READ_BT_16(packet, 12);
mtu = READ_BT_16(packet, 14); 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; break;
case RFCOMM_EVENT_CHANNEL_CLOSED: case RFCOMM_EVENT_CHANNEL_CLOSED:
printf("RFCOMM channel closed\n");
rfcomm_channel_id = 0; rfcomm_channel_id = 0;
break; break;
@ -155,6 +157,14 @@ 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<size;i++){
putchar(packet[i]);
}
printf("'\n");
break;
default: default:
break; break;
} }
@ -186,8 +196,8 @@ static int att_write_callback(uint16_t con_handle, uint16_t att_handle, uint16_t
static void heartbeat_handler(struct timer *ts){ static void heartbeat_handler(struct timer *ts){
counter++; counter++;
counter_string_len = sprintf(counter_string, "BTstack counter %04u\n\r", counter); counter_string_len = sprintf(counter_string, "BTstack counter %04u\n", counter);
puts(counter_string); printf("%s", counter_string);
if (rfcomm_channel_id){ if (rfcomm_channel_id){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) counter_string, counter_string_len); int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) counter_string, counter_string_len);
@ -232,10 +242,10 @@ void setup(void){
memset(spp_service_buffer, 0, sizeof(spp_service_buffer)); memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
// service_record_item_t * service_record_item = (service_record_item_t *) 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"); // 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_register_service_internal(NULL, service_record_item);
sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); 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); sdp_register_service_internal(NULL, spp_service_buffer);
hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO); hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO);

31
example/libusb/spp_counter.c
View File

@ -36,6 +36,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
bd_addr_t event_addr; bd_addr_t event_addr;
uint8_t rfcomm_channel_nr; uint8_t rfcomm_channel_nr;
uint16_t mtu; uint16_t mtu;
int i;
switch (packet_type) { switch (packet_type) {
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
@ -51,14 +52,14 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
case HCI_EVENT_COMMAND_COMPLETE: case HCI_EVENT_COMMAND_COMPLETE:
if (COMMAND_COMPLETE_EVENT(packet, hci_read_bd_addr)){ if (COMMAND_COMPLETE_EVENT(packet, hci_read_bd_addr)){
bt_flip_addr(event_addr, &packet[6]); 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;
} }
break; break;
case HCI_EVENT_PIN_CODE_REQUEST: case HCI_EVENT_PIN_CODE_REQUEST:
// inform about 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]); bt_flip_addr(event_addr, &packet[2]);
hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000"); hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
break; 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]); bt_flip_addr(event_addr, &packet[2]);
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); 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); rfcomm_accept_connection_internal(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: 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) // data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16)
if (packet[2]) { 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 { } else {
rfcomm_channel_id = READ_BT_16(packet, 12); rfcomm_channel_id = READ_BT_16(packet, 12);
mtu = READ_BT_16(packet, 14); 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; break;
case RFCOMM_EVENT_CHANNEL_CLOSED: case RFCOMM_EVENT_CHANNEL_CLOSED:
printf("RFCOMM channel closed\n");
rfcomm_channel_id = 0; rfcomm_channel_id = 0;
break; break;
@ -99,6 +101,14 @@ 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<size;i++){
putchar(packet[i]);
}
printf("'\n");
break;
default: default:
break; break;
} }
@ -106,11 +116,12 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
static void heartbeat_handler(struct timer *ts){ static void heartbeat_handler(struct timer *ts){
static int counter = 0;
if (rfcomm_channel_id){ if (rfcomm_channel_id){
static int counter = 0;
char lineBuffer[30]; char lineBuffer[30];
sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter); sprintf(lineBuffer, "BTstack counter %04u\n", ++counter);
puts(lineBuffer); printf("%s", lineBuffer);
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer)); int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
if (err) { if (err) {
log_error("rfcomm_send_internal -> error 0X%02x", err); log_error("rfcomm_send_internal -> error 0X%02x", err);
@ -150,10 +161,10 @@ void setup(void){
memset(spp_service_buffer, 0, sizeof(spp_service_buffer)); memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
// service_record_item_t * service_record_item = (service_record_item_t *) 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"); // 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_register_service_internal(NULL, service_record_item);
sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); 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); sdp_register_service_internal(NULL, spp_service_buffer);
hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO); hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO);