From: penglei <1624952103@qq.com> Date: Mon, 9 Sep 2024 11:37:38 +0000 (+0800) Subject: 优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补交) X-Git-Tag: release_V1.2.70_20241020_135402~518^2~2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F922%2Fhead;p=mirrors%2FFD230.git 优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补交) --- 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 8981256e3..3e15bce99 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c @@ -51,36 +51,6 @@ static int ConvertCmdToParam(uint8_t *para, uint32_t paraLen, return CUSTOM_UTILS_SUCCESS; } -#ifdef CYWEE_MAC_ACTIVE - -static int MyConvertCmdToParam(uint8_t *para, uint32_t paraLen, - uint8_t argv[CUSTOM_UTILS_MAX_ARGC][CUSTOM_UTILS_MAX_ARGV_LEN], uint32_t* argc) -{ - uint32_t pos = 0; - *argc = 0; - for (uint32_t i = 0; i < paraLen; i++) { - if ((para[i] == ' ' || para[i] == '\n') && pos != 0) { - argv[*argc][pos] = '\0'; - *argc += 1; - pos = 0; - if (*argc >= CUSTOM_UTILS_MAX_ARGC) { - return CUSTOM_UTILS_FAILED; - } - } else if (para[i] != ','){ - argv[*argc][pos] = para[i]; - pos++; - if (pos >= CUSTOM_UTILS_MAX_ARGV_LEN) { - return CUSTOM_UTILS_FAILED; - } - } - } - if (pos != 0) { - *argc += 1; - } - - return CUSTOM_UTILS_SUCCESS; -} -#endif static uint32_t custom_utils_setsn(uint8_t *para, uint32_t paraLen, char *strCommonCmd) { @@ -1165,7 +1135,7 @@ static uint32_t custom_cywee_save_mac_key(uint8_t *para, uint32_t paraLen, char uint8_t *send_data = NULL; uint8_t *tmp_data = NULL; - int ret = MyConvertCmdToParam(para, paraLen, argv, &argc); + int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; @@ -1205,7 +1175,7 @@ static uint32_t custom_cywee_save_mac_key(uint8_t *para, uint32_t paraLen, char for(int i = 0,j = 0; i < len * 2 ; i+=2 , j++) { send_data[j] = tmp_data[i] * 16 | tmp_data[i+1]; - wstp_print("tmp_data[%d] : 0X%2X\n",j,send_data[j]); + wstp_print("send_data[%d] : 0X%2X\n",j,send_data[j]); } uapi_cywee_save_mac_key(send_data,len); free(send_data);