From: penglei <1624952103@qq.com> Date: Wed, 3 Apr 2024 12:05:48 +0000 (+0800) Subject: 优化蓝牙产测 MCU ID X-Git-Tag: release_V1.2.70_20241020_135402~1234 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=56bd124da6ef3b82a9f3b5eb45254e1bf36c9fd6;p=mirrors%2FFD230.git 优化蓝牙产测 MCU ID --- diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c index 658ff9416..5d0d4dab4 100644 --- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c +++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c @@ -544,6 +544,79 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint break; + + //温度 + case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_TEMPERATURE: + break; + + + + //老化测试 + case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST: + if(testitem == 0x01) + { + //进入老化命令 + uint8_t send_data = 0x00; + + set_system_time((char *)data); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, + 0x01, + &send_data, + 1); + } else if(testitem == 0x02) + { + //停止老化 + uint8_t send_data = 0x00; + + set_system_time((char *)data); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, + 0x02, + &send_data, + 1); + + } else if(testitem == 0x03) + { + //查询老化标志 + uint8_t send_data = 0x00; + + set_system_time((char *)data); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, + 0x03, + &send_data, + 1); + + } else if(testitem == 0x04) + { + //查询老化结果 + uint8_t send_data = 0x00; + + set_system_time((char *)data); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, + 0x04, + &send_data, + 1); + + } else if(testitem == 0x05) + { + //清除老化结果 + uint8_t send_data = 0x00; + + set_system_time((char *)data); + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST, + 0x05, + &send_data, + 1); + } + + + break; + + case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD: if(testitem == 0x01) { @@ -578,9 +651,6 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint uint8_t soc_id[20] = {0}; // 20 is soc id length uapi_soc_read_id(soc_id, 20); - for(i = 0; i < 20; i++) - PRINT("soc_id[%d] : %2X \r\n",i,soc_id[i]); - factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD, 0x11, diff --git a/code/sdk/application/wstp/at_service/app/app_common_api.c b/code/sdk/application/wstp/at_service/app/app_common_api.c index 597d1ff11..9bf572023 100755 --- a/code/sdk/application/wstp/at_service/app/app_common_api.c +++ b/code/sdk/application/wstp/at_service/app/app_common_api.c @@ -197,20 +197,20 @@ uint32_t get_system_time(char *timedata) wstp_print("%s", timebuf); } - sprintf(timedata,"%s",timebuf); + //sprintf(timedata,"%s",timebuf); uint32_t millisec = tv.tv_usec / USEC_TO_MILLI; wstp_print(":%03d\n", millisec); - // char millisecdata[4] = {0}; - // millisecdata[0] = (char)((millisec & 0XFF000000)>> 24); - // millisecdata[1] = (char)((millisec & 0X00FF0000)>> 16); - // millisecdata[2] = (char)((millisec & 0X0000FF00)>> 8); - // millisecdata[3] = (char)((millisec & 0X000000FF)>> 0); + char millisecdata[5] = {0}; + millisecdata[0] = (char)((millisec & 0XFF000000)>> 24); + millisecdata[1] = (char)((millisec & 0X00FF0000)>> 16); + millisecdata[2] = (char)((millisec & 0X0000FF00)>> 8); + millisecdata[3] = (char)((millisec & 0X000000FF)>> 0); - // PRINT("mil %d %d %d %d \r\n",millisecdata[0],millisecdata[1],millisecdata[2],millisecdata[3]); + PRINT("mil %d %d %d %d \r\n",millisecdata[0],millisecdata[1],millisecdata[2],millisecdata[3]); - // sprintf(timedata,"%s%s",timebuf,millisecdata); + sprintf(timedata,"%s%s",timebuf,millisecdata); return ERRCODE_SUCC; }