From bc559e16e11293624ecc9b63d6e0ff34fd188eda Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Fri, 9 Aug 2024 19:06:22 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9pbap=20AT=E5=91=BD=E4=BB=A4?= =?utf8?q?=E4=BB=A3=E7=A0=81=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../bluetooth/include/Bluetooyhpabpserver.h | 2 +- .../slip/cat1Service/cat1_at_cmd.cpp | 74 +---------- .../peripheral/utils/custom_utils_at_cmd.c | 115 ++++++++++++++++++ 3 files changed, 118 insertions(+), 73 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/Bluetooyhpabpserver.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/Bluetooyhpabpserver.h index 44ed2fc8b..0af43bc3c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/Bluetooyhpabpserver.h +++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/Bluetooyhpabpserver.h @@ -15,7 +15,7 @@ void uapi_pbap_pce_reg_callback(void); void uapi_pbap_cmd_start_client(void); void uapi_pbap_cmd_pull_phonebook(void); -void uapi_pbap_cmd_pull_vcard_listing(); +void uapi_pbap_cmd_pull_vcard_listing(void); void uapi_pbap_cmd_pull_vcard_entry(td_char *vcf_name); #endif /* SAMPLE_PBAP_SERVICE_H */ diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp index e437359ba..f88004f74 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp @@ -310,75 +310,7 @@ static uint32_t read_ADDRESS(uint8_t *para, uint32_t paraLen, char *strCommonCmd return ERRCODE_SUCC; } -#include "Bluetooyhpabpserver.h" -static uint32_t PBAP_ENTRY_ADDRESS(uint8_t *para, uint32_t paraLen, char *strCommonCmd) -{ - UNUSED(strCommonCmd); - uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; - uint32_t argc = 0; - - int ret = ConvertCmdToParam(para, paraLen, argv, &argc); - if (ret != PPG_SUCCESS) { - printf("CAT1TEST ATCMD Convert Command Failed\n"); - return ERRCODE_FAIL; - } - #ifdef FD230 - uapi_pbap_cmd_pull_vcard_entry((char *)argv[0]); - #endif - return ERRCODE_SUCC; -} - -static uint32_t PBAP_CONNECT(uint8_t *para, uint32_t paraLen, char *strCommonCmd) -{ - UNUSED(strCommonCmd); - uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; - uint32_t argc = 0; - - int ret = ConvertCmdToParam(para, paraLen, argv, &argc); - if (ret != PPG_SUCCESS) { - printf("CAT1TEST ATCMD Convert Command Failed\n"); - return ERRCODE_FAIL; - } - #ifdef FD230 - uapi_pbap_cmd_start_client(); - #endif - return ERRCODE_SUCC; -} - -static uint32_t PBAP_PULL(uint8_t *para, uint32_t paraLen, char *strCommonCmd) -{ - UNUSED(strCommonCmd); - uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; - uint32_t argc = 0; - - int ret = ConvertCmdToParam(para, paraLen, argv, &argc); - if (ret != PPG_SUCCESS) { - printf("CAT1TEST ATCMD Convert Command Failed\n"); - return ERRCODE_FAIL; - } - #ifdef FD230 - uapi_pbap_cmd_pull_phonebook(); - #endif - return ERRCODE_SUCC; -} - -static uint32_t PBAP_LS(uint8_t *para, uint32_t paraLen, char *strCommonCmd) -{ - UNUSED(strCommonCmd); - uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN] = { 0 }; - uint32_t argc = 0; - - int ret = ConvertCmdToParam(para, paraLen, argv, &argc); - if (ret != PPG_SUCCESS) { - printf("CAT1TEST ATCMD Convert Command Failed\n"); - return ERRCODE_FAIL; - } - #ifdef FD230 - uapi_pbap_cmd_pull_vcard_listing(); - #endif - return ERRCODE_SUCC; -} @@ -400,10 +332,8 @@ static const at_cmd_table_t g_cat1_cmd[] = { { (char *)"AT^CALL_1", AT_CALL_ifconfig, (char *)"1" }, { (char *)"AT^CALL_ADD_ADRESSBOOK", ADD_ADDRESS, (char *)"1" }, { (char *)"AT^CALL_READ_ADRESSBOOK", read_ADDRESS, (char *)"1" }, - { (char *)"AT^CALL_BT_ENTRY_ADRESSBOOK", PBAP_ENTRY_ADDRESS, (char *)"1" }, - { (char *)"AT^CALL_BT_CONNECT_PBAP", PBAP_CONNECT, (char *)"1" }, - { (char *)"AT^PBAP_PULL", PBAP_PULL, (char *)"1" }, - { (char *)"AT^PBAP_LS", PBAP_LS, (char *)"1" }, + + }; diff --git a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c index e6baaf963..3519938c2 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c @@ -949,6 +949,115 @@ static uint32_t custom_a5133_rssi(uint8_t *para, uint32_t paraLen, char *strComm #endif +#include "Bluetooyhpabpserver.h" + +static uint32_t PBAP_ENTRY_ADDRESS(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN] = {0}; + uint32_t argc = 0; + + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != CUSTOM_UTILS_SUCCESS) + { + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + + #ifdef FD230 + uapi_pbap_cmd_pull_vcard_entry((char *)argv[0]); + + #endif + return ERRCODE_SUCC; +} + +static uint32_t PBAP_CONNECT(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN] = {0}; + uint32_t argc = 0; + + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != CUSTOM_UTILS_SUCCESS) + { + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + + #ifdef FD230 + uapi_pbap_cmd_start_client(); + #endif + return ERRCODE_SUCC; +} + +static uint32_t PBAP_PULL(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN] = {0}; + uint32_t argc = 0; + + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != CUSTOM_UTILS_SUCCESS) + { + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + + #ifdef FD230 + uapi_pbap_cmd_pull_phonebook(); + #endif + return ERRCODE_SUCC; +} + +static uint32_t PBAP_LS(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN] = {0}; + uint32_t argc = 0; + + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != CUSTOM_UTILS_SUCCESS) + { + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + + #ifdef FD230 + uapi_pbap_cmd_pull_vcard_listing(); + #endif + return ERRCODE_SUCC; +} + +#include "bletest.h" +static uint32_t BLE_TEST(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + UNUSED(strCommonCmd); + uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN] = {0}; + uint32_t argc = 0; + + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); + if (ret != CUSTOM_UTILS_SUCCESS) + { + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + return ERRCODE_FAIL; + } + printf("BLE_TEST \n"); + #ifdef FD230 + uint8_t type =atoi( (char *)argv[0]); + switch (type) + { + case 0: + //delete_before_file(atoi( (char *)argv[1])); + break; + default: + break; + } + #endif + printf("BLE_TEST END \n"); + return ERRCODE_SUCC; +} + + static const at_cmd_table_t g_custom_utils_cmd[] = { { (char *)"AT^CUSTOM_SN", custom_utils_setsn, (char *)"123456789ABCDEF2345678" }, { (char *)"AT^CUSTOM_SN_REQ", custom_utils_getsn, (char *)" " }, @@ -1014,8 +1123,14 @@ static const at_cmd_table_t g_custom_utils_cmd[] = { #ifdef SUPPORT_A5133_SERVICE {(char *)"AT^A5133SENDDATA", custom_a5133_send_msg, (char *)" "}, {(char *)"AT^A5133RSSI", custom_a5133_rssi, (char *)" "}, + #endif + { (char *)"AT^CALL_BT_ENTRY_ADRESSBOOK", PBAP_ENTRY_ADDRESS, (char *)" " }, + { (char *)"AT^CALL_BT_CONNECT_PBAP", PBAP_CONNECT, (char *)" " }, + { (char *)"AT^PBAP_PULL", PBAP_PULL, (char *)" " }, + { (char *)"AT^PBAP_LS", PBAP_LS, (char *)" " }, + { (char *)"AT^BLE_TEST", BLE_TEST, (char *)" " }, }; -- 2.17.1