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

example/pbap_client_demo: improve user interface

Browse Source
This commit is contained in:
Matthias Ringwald 2021-12-21 12:56:58 +01:00
parent c79e33a22c
commit e4722de56f
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
example/pbap_client_demo.c
View File

@ -82,6 +82,11 @@ static const char * spd_name = "spd";
static const char * phonebook_name; static const char * phonebook_name;
static char phonebook_folder[30]; static char phonebook_folder[30];
static char phonebook_path[30]; static char phonebook_path[30];
static enum {
PBAP_PATH_ROOT,
PBAP_PATH_FOLDER,
PBAP_PATH_PHONEBOOK
} pbap_client_demo_path_type;
static btstack_packet_callback_registration_t hci_event_callback_registration; static btstack_packet_callback_registration_t hci_event_callback_registration;
static uint16_t pbap_cid; static uint16_t pbap_cid;
@ -110,7 +115,6 @@ static void show_usage(void){
printf("\n--- Bluetooth PBAP Client (HF) Test Console %s ---\n", bd_addr_to_str(iut_address)); printf("\n--- Bluetooth PBAP Client (HF) Test Console %s ---\n", bd_addr_to_str(iut_address));
printf("Phonebook: '%s'\n", phonebook_folder); printf("Phonebook: '%s'\n", phonebook_folder);
// printf("Phonebook folder '%s'\n", phonebook_folder);
printf("Phonebook path '%s'\n", phonebook_path); printf("Phonebook path '%s'\n", phonebook_path);
printf("\n"); printf("\n");
printf("a - establish PBAP connection to %s\n", bd_addr_to_str(remote_addr)); printf("a - establish PBAP connection to %s\n", bd_addr_to_str(remote_addr));
@ -131,11 +135,10 @@ static void show_usage(void){
printf("d - get size of '%s'\n", phonebook_path); printf("d - get size of '%s'\n", phonebook_path);
printf("g - pull phonebook '%s'\n", phonebook_path); printf("g - pull phonebook '%s'\n", phonebook_path);
printf("h - pull vCard listing '%s'\n", phonebook_folder); printf("h - pull vCard listing '%s'\n", phonebook_name);
printf("l - get vCard 0.vcf\n"); printf("l - get owner vCard 0.vcf\n");
printf("L - get vCard X-BT-UID::1234567890ABCDEF1234567890000001\n");
printf("j - Lookup contact with number '%s'\n", phone_number); printf("j - Lookup contact with number '%s'\n", phone_number);
printf("t - disconnnect\n"); printf("t - disconnect\n");
printf("p - authenticate using password '0000'\n"); printf("p - authenticate using password '0000'\n");
printf("r - set path to 'telecom'\n"); printf("r - set path to 'telecom'\n");
printf("x - abort operation\n"); printf("x - abort operation\n");
@ -144,6 +147,9 @@ static void show_usage(void){
static void stdin_process(char c){ static void stdin_process(char c){
switch (c){ switch (c){
case '\n':
case '\r':
break;
case 'a': case 'a':
printf("[+] Connecting to %s...\n", bd_addr_to_str(remote_addr)); printf("[+] Connecting to %s...\n", bd_addr_to_str(remote_addr));
pbap_connect(&packet_handler, remote_addr, &pbap_cid); pbap_connect(&packet_handler, remote_addr, &pbap_cid);
@ -163,22 +169,29 @@ static void stdin_process(char c){
pbap_pull_phonebook(pbap_cid, phonebook_path); pbap_pull_phonebook(pbap_cid, phonebook_path);
break; break;
case 'h': case 'h':
printf("[+] Pull vCard list for '%s'\n", phonebook_folder); if (pbap_client_demo_path_type != PBAP_PATH_FOLDER){
pbap_pull_vcard_listing(pbap_cid, ""); printf("[!] Pull vCard list requires to set phonebook folder, e.g. using 'r' command\n");
break;
}
printf("[+] Pull vCard list for '%s'\n", phonebook_name);
pbap_pull_vcard_listing(pbap_cid, phonebook_name);
break; break;
case 'j': case 'j':
if (pbap_client_demo_path_type != PBAP_PATH_PHONEBOOK){
printf("[!] Pull vCard list requires to set phonenbook folder, e.g. using 'u' command\n");
break;
}
printf("[+] Lookup name for number '%s'\n", phone_number); printf("[+] Lookup name for number '%s'\n", phone_number);
pbap_lookup_by_number(pbap_cid, phone_number); pbap_lookup_by_number(pbap_cid, phone_number);
break; break;
case 'l': case 'l':
printf("[+] Pull vCard '1.vcf'\n"); if (pbap_client_demo_path_type != PBAP_PATH_PHONEBOOK){
pbap_pull_vcard_entry(pbap_cid, "1.vcf"); printf("[!] Pull vCard entry requires to set phonenbook folder, e.g. using 'u' command\n");
break;
}
printf("[+] Pull vCard '0.vcf'\n");
pbap_pull_vcard_entry(pbap_cid, "0.vcf");
break; break;
case 'L':
printf("[+] Pull vCard 'X-BT-UID:1234567890ABCDEF1234567890000001'\n");
pbap_pull_vcard_entry(pbap_cid, "X-BT-UID:1234567890ABCDEF1234567890000001");
break;
case 'c': case 'c':
printf("[+] Select phonebook '%s'\n", cch_name); printf("[+] Select phonebook '%s'\n", cch_name);
select_phonebook(cch_name); select_phonebook(cch_name);
@ -221,14 +234,17 @@ static void stdin_process(char c){
break; break;
case 'r': case 'r':
printf("[+] Set path to '/telecom'\n"); printf("[+] Set path to '/telecom'\n");
pbap_client_demo_path_type = PBAP_PATH_FOLDER;
pbap_set_phonebook(pbap_cid, "telecom"); pbap_set_phonebook(pbap_cid, "telecom");
break; break;
case 'R': case 'R':
printf("[+] Set path to '/SIM1/telecom'\n"); printf("[+] Set path to '/SIM1/telecom'\n");
pbap_client_demo_path_type = PBAP_PATH_FOLDER;
pbap_set_phonebook(pbap_cid, "SIM1/telecom"); pbap_set_phonebook(pbap_cid, "SIM1/telecom");
break; break;
case 'u': case 'u':
printf("[+] Set path to '%s'\n", phonebook_folder); printf("[+] Set path to '%s'\n", phonebook_folder);
pbap_client_demo_path_type = PBAP_PATH_PHONEBOOK;
pbap_set_phonebook(pbap_cid, phonebook_folder); pbap_set_phonebook(pbap_cid, phonebook_folder);
break; break;
case 'x': case 'x':
@ -269,6 +285,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
} else { } else {
printf("[+] Connected\n"); printf("[+] Connected\n");
} }
pbap_client_demo_path_type = PBAP_PATH_ROOT;
break; break;
case PBAP_SUBEVENT_CONNECTION_CLOSED: case PBAP_SUBEVENT_CONNECTION_CLOSED:
printf("[+] Connection closed\n"); printf("[+] Connection closed\n");