mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

hsp ag: pts test passed

Browse Source
This commit is contained in:
mila@ringwald.ch 2015-03-01 22:58:19 +00:00
parent 187d66ee88
commit c53851e80c
3 changed files with 88 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
example/embedded/hsp_ag.c
View File

@ -92,8 +92,7 @@ static uint8_t ag_ring = 0;
static uint8_t ag_send_ok = 0; static uint8_t ag_send_ok = 0;
static uint8_t ag_send_error = 0; static uint8_t ag_send_error = 0;
static uint8_t ag_in_band_ring_tone = 0; static uint8_t ag_in_band_ring_tone = 0;
static uint8_t ag_at_ckpd_received = 0; static uint8_t ag_num_button_press_received = 0;
static uint8_t ag_button_press_received = 0;
typedef enum { typedef enum {
HSP_IDLE, HSP_IDLE,
@ -101,6 +100,7 @@ typedef enum {
HSP_W4_SDP_QUERY_COMPLETE, HSP_W4_SDP_QUERY_COMPLETE,
HSP_W4_RFCOMM_CONNECTED, HSP_W4_RFCOMM_CONNECTED,
HSP_W4_RING_ANSWER, HSP_W4_RING_ANSWER,
HSP_W4_USER_ACTION,
HSP_W2_CONNECT_SCO, HSP_W2_CONNECT_SCO,
HSP_W4_SCO_CONNECTED, HSP_W4_SCO_CONNECTED,
HSP_ACTIVE, HSP_ACTIVE,
@ -217,7 +217,7 @@ static int send_str_over_rfcomm(uint16_t cid, char * command){
printf("rfcomm_send_internal -> error 0X%02x", err); printf("rfcomm_send_internal -> error 0X%02x", err);
return err; return err;
} }
printf("rfcomm send string %s\n", command); printf("Send string: \"%s\"\n", command);
return err; return err;
} }
@ -232,8 +232,7 @@ static void hsp_ag_reset_state(){
ag_send_error = 0; ag_send_error = 0;
ag_ring = 0; ag_ring = 0;
ag_at_ckpd_received = 0; ag_num_button_press_received = 0;
ag_button_press_received = 0;
ag_microphone_gain = -1; ag_microphone_gain = -1;
ag_speaker_gain = -1; ag_speaker_gain = -1;
@ -320,16 +319,28 @@ static void hsp_timeout_stop(){
run_loop_remove_timer(&hs_timeout); run_loop_remove_timer(&hs_timeout);
} }
void hsp_ag_start_ringing(){
if (hsp_state != HSP_W2_CONNECT_SCO) return;
ag_ring = 1;
hsp_state = HSP_W4_RING_ANSWER;
hsp_timeout_start();
}
void hsp_ag_stop_ringing(){
ag_ring = 0;
ag_num_button_press_received = 0;
hsp_state = HSP_W2_CONNECT_SCO;
hsp_timeout_stop();
}
static void hsp_run(){ static void hsp_run(){
int err; int err;
if (ag_at_ckpd_received){
ag_send_ok = 1;
ag_at_ckpd_received = 0;
}
if (ag_send_ok){ if (ag_send_ok){
err = send_str_over_rfcomm(rfcomm_cid, HSP_AG_OK); err = send_str_over_rfcomm(rfcomm_cid, HSP_AG_OK);
if (!err) ag_send_ok = 0; if (!err){
ag_send_ok = 0;
}
return; return;
} }
@ -342,8 +353,8 @@ static void hsp_run(){
switch (hsp_state){ switch (hsp_state){
case HSP_SDP_QUERY_RFCOMM_CHANNEL: case HSP_SDP_QUERY_RFCOMM_CHANNEL:
hsp_state = HSP_W4_SDP_QUERY_COMPLETE; hsp_state = HSP_W4_SDP_QUERY_COMPLETE;
printf("Start SDP query %s, 0x%02x\n", bd_addr_to_str(remote), SDP_Headset_HS); printf("Start SDP query %s, 0x%02x\n", bd_addr_to_str(remote), SDP_HSP);
sdp_query_rfcomm_channel_and_name_for_uuid(remote, SDP_Headset_HS); sdp_query_rfcomm_channel_and_name_for_uuid(remote, SDP_HSP);
break; break;
case HSP_W4_RING_ANSWER: case HSP_W4_RING_ANSWER:
@ -358,15 +369,15 @@ static void hsp_run(){
break; break;
} }
if (!ag_button_press_received) break; if (!ag_num_button_press_received) break;
err = send_str_over_rfcomm(rfcomm_cid, HSP_AG_OK); err = send_str_over_rfcomm(rfcomm_cid, HSP_AG_OK);
if (!err) { if (!err) {
hsp_state = HSP_W2_CONNECT_SCO; hsp_state = HSP_W2_CONNECT_SCO;
ag_send_ok = 0; ag_send_ok = 0;
ag_num_button_press_received = 0;
} }
break; break;
case HSP_W2_CONNECT_SCO: case HSP_W2_CONNECT_SCO:
if (!hci_can_send_command_packet_now()) break; if (!hci_can_send_command_packet_now()) break;
hsp_state = HSP_W4_SCO_CONNECTED; hsp_state = HSP_W4_SCO_CONNECTED;
@ -374,6 +385,8 @@ static void hsp_run(){
break; break;
case HSP_W2_DISCONNECT_SCO: case HSP_W2_DISCONNECT_SCO:
ag_num_button_press_received = 0;
hsp_state = HSP_W4_SCO_DISCONNECTED; hsp_state = HSP_W4_SCO_DISCONNECTED;
gap_disconnect(sco_handle); gap_disconnect(sco_handle);
break; break;
@ -386,7 +399,7 @@ static void hsp_run(){
if (ag_microphone_gain >= 0){ if (ag_microphone_gain >= 0){
char buffer[10]; char buffer[10];
sprintf(buffer, "%s=%d\r", HSP_MICROPHONE_GAIN, ag_microphone_gain); sprintf(buffer, "%s=%d\r\n", HSP_MICROPHONE_GAIN, ag_microphone_gain);
err = send_str_over_rfcomm(rfcomm_cid, buffer); err = send_str_over_rfcomm(rfcomm_cid, buffer);
if (!err) ag_microphone_gain = -1; if (!err) ag_microphone_gain = -1;
break; break;
@ -394,12 +407,11 @@ static void hsp_run(){
if (ag_speaker_gain >= 0){ if (ag_speaker_gain >= 0){
char buffer[10]; char buffer[10];
sprintf(buffer, "%s=%d\r", HSP_SPEAKER_GAIN, ag_speaker_gain); sprintf(buffer, "%s=%d\r\n", HSP_SPEAKER_GAIN, ag_speaker_gain);
err = send_str_over_rfcomm(rfcomm_cid, buffer); err = send_str_over_rfcomm(rfcomm_cid, buffer);
if (!err) ag_speaker_gain = -1; if (!err) ag_speaker_gain = -1;
break; break;
} }
break; break;
default: default:
break; break;
@ -410,30 +422,29 @@ static void hsp_run(){
static void packet_handler (void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ static void packet_handler (void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
// printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]); // printf("packet_handler type %u, packet[0] %x\n", packet_type, packet[0]);
if (packet_type == RFCOMM_DATA_PACKET){ if (packet_type == RFCOMM_DATA_PACKET){
if (strncmp((char *)packet, HSP_HS_BUTTON_PRESS, 11) == 0){ if (strncmp((char *)packet, HSP_HS_BUTTON_PRESS, 7) == 0){
printf("Received button press %s\n", HSP_HS_BUTTON_PRESS); printf("Received button press %s\n", HSP_HS_BUTTON_PRESS);
// hsp_state: HSP_W4_RING_ANSWER ag_num_button_press_received++;
ag_button_press_received = 1;
ag_send_ok = 1; ag_send_ok = 1;
hsp_timeout_stop(); if (hsp_state == HSP_ACTIVE && ag_num_button_press_received >=2){
ag_num_button_press_received = 0;
hsp_state = HSP_W2_DISCONNECT_SCO;
}
} else if (strncmp((char *)packet, HSP_HS_MICROPHONE_GAIN, 7) == 0){ } else if (strncmp((char *)packet, HSP_HS_MICROPHONE_GAIN, 7) == 0){
uint8_t gain = (uint8_t)atoi((char*)&packet[8]); uint8_t gain = (uint8_t)atoi((char*)&packet[7]);
ag_send_ok = 1; ag_send_ok = 1;
emit_event(HSP_SUBEVENT_MICROPHONE_GAIN_CHANGED, gain); emit_event(HSP_SUBEVENT_MICROPHONE_GAIN_CHANGED, gain);
} else if (strncmp((char *)packet, HSP_HS_SPEAKER_GAIN, 7) == 0){ } else if (strncmp((char *)packet, HSP_HS_SPEAKER_GAIN, 7) == 0){
uint8_t gain = (uint8_t)atoi((char*)&packet[8]); uint8_t gain = (uint8_t)atoi((char*)&packet[7]);
ag_send_ok = 1; ag_send_ok = 1;
emit_event(HSP_SUBEVENT_SPEAKER_GAIN_CHANGED, gain); emit_event(HSP_SUBEVENT_SPEAKER_GAIN_CHANGED, gain);
} else if (strncmp((char *)packet, HSP_HS_AT_CKPD, 7) == 0){
ag_at_ckpd_received = 1;
} else if (strncmp((char *)packet, "AT+", 3) == 0){ } else if (strncmp((char *)packet, "AT+", 3) == 0){
ag_send_error = 1; ag_send_error = 1;
} }
if (ag_at_ckpd_received || ag_send_error){ if (ag_send_error){
if (!hsp_ag_callback) return; if (!hsp_ag_callback) return;
// re-use incoming buffer to avoid reserving large buffers - ugly but efficient // re-use incoming buffer to avoid reserving large buffers - ugly but efficient
uint8_t * event = packet - 3; uint8_t * event = packet - 3;
@ -525,7 +536,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_cid); rfcomm_accept_connection_internal(rfcomm_cid);
hsp_state = HSP_W2_CONNECT_SCO; hsp_state = HSP_W4_RFCOMM_CONNECTED;
break; break;
@ -545,9 +556,8 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
switch (hsp_state){ switch (hsp_state){
case HSP_W4_RFCOMM_CONNECTED: case HSP_W4_RFCOMM_CONNECTED:
hsp_state = HSP_W4_RING_ANSWER; ag_num_button_press_received = 0;
ag_ring = 1; hsp_state = HSP_W2_CONNECT_SCO;
hsp_timeout_start();
break; break;
case HSP_W4_CONNECTION_ESTABLISHED_TO_SHUTDOWN: case HSP_W4_CONNECTION_ESTABLISHED_TO_SHUTDOWN:
hsp_state = HSP_W2_DISCONNECT_RFCOMM; hsp_state = HSP_W2_DISCONNECT_RFCOMM;
@ -568,6 +578,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
} }
handle = READ_BT_16(packet,3); handle = READ_BT_16(packet,3);
if (handle == sco_handle){ if (handle == sco_handle){
printf("SCO disconnected, w2 disconnect RFCOMM\n");
sco_handle = 0; sco_handle = 0;
hsp_state = HSP_W2_DISCONNECT_RFCOMM; hsp_state = HSP_W2_DISCONNECT_RFCOMM;
break; break;

3
example/embedded/hsp_ag.h
View File

@ -68,6 +68,9 @@ void hsp_ag_set_microphone_gain(uint8_t gain);
// +VGS=[0..15] // +VGS=[0..15]
void hsp_ag_set_speaker_gain(uint8_t gain); void hsp_ag_set_speaker_gain(uint8_t gain);
void hsp_ag_start_ringing();
void hsp_ag_stop_ringing();
#if defined __cplusplus #if defined __cplusplus
} }
#endif #endif

70
example/embedded/hsp_ag_test.c
View File

@ -69,11 +69,9 @@
static uint8_t hsp_service_buffer[150]; static uint8_t hsp_service_buffer[150];
static uint8_t rfcomm_channel_nr = 1; static uint8_t rfcomm_channel_nr = 1;
static uint8_t ag_speaker_gain = 0;
static uint8_t ag_microphone_gain = 0;
static char hsp_ag_service_name[] = "Audio Gateway Test"; static char hsp_ag_service_name[] = "Audio Gateway Test";
static bd_addr_t bt_speaker_addr = {0x00, 0x21, 0x3C, 0xAC, 0xF7, 0x38}; static bd_addr_t bt_speaker_addr = {0x00, 0x21, 0x3C, 0xAC, 0xF7, 0x38};
static bd_addr_t pts_addr = {0x00,0x1b,0xDC,0x07,0x32,0xEF};
static char hs_cmd_buffer[100]; static char hs_cmd_buffer[100];
// prototypes // prototypes
@ -83,26 +81,20 @@ static void show_usage();
// Testig User Interface // Testig User Interface
static data_source_t stdin_source; static data_source_t stdin_source;
static uint8_t next_ag_microphone_gain(){
ag_microphone_gain++;
if (ag_microphone_gain > 15) ag_microphone_gain = 0;
return ag_microphone_gain;
}
static uint8_t next_ag_speaker_gain(){
ag_speaker_gain++;
if (ag_speaker_gain > 15) ag_speaker_gain = 0;
return ag_speaker_gain;
}
static void show_usage(){ static void show_usage(){
printf("\n--- Bluetooth HSP AudioGateway Test Console ---\n"); printf("\n--- Bluetooth HSP AudioGateway Test Console ---\n");
printf("---\n"); printf("---\n");
printf("p - establish audio connection to PTS module\n");
printf("e - establish audio connection to Bluetooth Speaker\n"); printf("e - establish audio connection to Bluetooth Speaker\n");
printf("r - release audio connection from Bluetooth Speaker\n"); printf("d - release audio connection from Bluetooth Speaker\n");
printf("m - set microphone gain\n"); printf("m - set microphone gain 8\n");
printf("s - set speaker gain\n"); printf("M - set microphone gain 15\n");
printf("o - set speaker gain 0\n");
printf("s - set speaker gain 8\n");
printf("S - set speaker gain 15\n");
printf("r - start ringing\n");
printf("t - stop ringing\n");
printf("---\n"); printf("---\n");
printf("Ctrl-c - exit\n"); printf("Ctrl-c - exit\n");
printf("---\n"); printf("---\n");
@ -113,21 +105,45 @@ static int stdin_process(struct data_source *ds){
read(ds->fd, &buffer, 1); read(ds->fd, &buffer, 1);
switch (buffer){ switch (buffer){
case 'p':
printf("Establishing audio connection to PTS module %s...\n", bd_addr_to_str(pts_addr));
hsp_ag_connect(pts_addr);
break;
case 'e': case 'e':
printf("Establishing audio connection to Bluetooth Speaker %s...\n", bd_addr_to_str(bt_speaker_addr)); printf("Establishing audio connection to Bluetooth Speaker %s...\n", bd_addr_to_str(bt_speaker_addr));
hsp_ag_connect(bt_speaker_addr); hsp_ag_connect(bt_speaker_addr);
break; break;
case 'r': case 'd':
printf("Releasing audio connection from Bluetooth Speaker %s...\n", bd_addr_to_str(bt_speaker_addr)); printf("Releasing audio connection from Bluetooth Speaker %s...\n", bd_addr_to_str(bt_speaker_addr));
hsp_ag_disconnect(); hsp_ag_disconnect();
break; break;
case 'm': case 'm':
printf("Setting microphone gain\n"); printf("Setting microphone gain 8\n");
hsp_ag_set_microphone_gain(next_ag_microphone_gain()); hsp_ag_set_microphone_gain(8);
break;
case 'M':
printf("Setting microphone gain 15\n");
hsp_ag_set_microphone_gain(15);
break;
case 'o':
printf("Setting speaker gain 0\n");
hsp_ag_set_speaker_gain(0);
break; break;
case 's': case 's':
printf("Setting speaker gain\n"); printf("Setting speaker gain 8\n");
hsp_ag_set_speaker_gain(next_ag_speaker_gain()); hsp_ag_set_speaker_gain(8);
break;
case 'S':
printf("Setting speaker gain 15\n");
hsp_ag_set_speaker_gain(15);
break;
case 'r':
printf("Start ringing\n");
hsp_ag_start_ringing();
break;
case 't':
printf("Stop ringing\n");
hsp_ag_stop_ringing();
break; break;
default: default:
show_usage(); show_usage();
@ -183,7 +199,7 @@ void packet_handler(uint8_t * event, uint16_t event_size){
memset(hs_cmd_buffer, 0, sizeof(hs_cmd_buffer)); memset(hs_cmd_buffer, 0, sizeof(hs_cmd_buffer));
int size = event_size <= sizeof(hs_cmd_buffer)? event_size : sizeof(hs_cmd_buffer); int size = event_size <= sizeof(hs_cmd_buffer)? event_size : sizeof(hs_cmd_buffer);
memcpy(hs_cmd_buffer, &event[3], size - 1); memcpy(hs_cmd_buffer, &event[3], size - 1);
printf("Received command %s\n", hs_cmd_buffer); printf("Received command: \"%s\"\n", hs_cmd_buffer);
break; break;
} }
default: default:
@ -196,12 +212,12 @@ int btstack_main(int argc, const char * argv[]){
memset((uint8_t *)hsp_service_buffer, 0, sizeof(hsp_service_buffer)); memset((uint8_t *)hsp_service_buffer, 0, sizeof(hsp_service_buffer));
hsp_ag_create_service((uint8_t *)hsp_service_buffer, rfcomm_channel_nr, hsp_ag_service_name); hsp_ag_create_service((uint8_t *)hsp_service_buffer, rfcomm_channel_nr, hsp_ag_service_name);
sdp_init();
sdp_register_service_internal(NULL, (uint8_t *)hsp_service_buffer);
hsp_ag_init(rfcomm_channel_nr); hsp_ag_init(rfcomm_channel_nr);
hsp_ag_register_packet_handler(packet_handler); hsp_ag_register_packet_handler(packet_handler);
// turn on! // turn on!
sdp_init();
sdp_register_service_internal(NULL, (uint8_t *)hsp_service_buffer);
hci_power_control(HCI_POWER_ON); hci_power_control(HCI_POWER_ON);
setup_cli(); setup_cli();