优化蓝牙产测 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 658ff94..5d0d4da 100644 (file)
--- 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
 \r
             break;\r
 \r
+\r
+        //温度\r
+        case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_TEMPERATURE:\r
+            break;\r
+\r
+\r
+\r
+        //老化测试\r
+        case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST:\r
+            if(testitem == 0x01)\r
+            {\r
+                //进入老化命令\r
+                uint8_t send_data = 0x00;\r
+\r
+                set_system_time((char *)data);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
+                        0x01,\r
+                        &send_data,\r
+                        1);\r
+            } else if(testitem == 0x02)\r
+            {\r
+                //停止老化\r
+                uint8_t send_data = 0x00;\r
+\r
+                set_system_time((char *)data);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
+                        0x02,\r
+                        &send_data,\r
+                        1);\r
+\r
+            } else if(testitem == 0x03)\r
+            {\r
+                //查询老化标志\r
+                uint8_t send_data = 0x00;\r
+\r
+                set_system_time((char *)data);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
+                        0x03,\r
+                        &send_data,\r
+                        1);\r
+                \r
+            } else if(testitem == 0x04)\r
+            {\r
+                //查询老化结果\r
+                uint8_t send_data = 0x00;\r
+\r
+                set_system_time((char *)data);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
+                        0x04,\r
+                        &send_data,\r
+                        1);\r
+\r
+            } else if(testitem == 0x05)\r
+            {\r
+                //清除老化结果\r
+                uint8_t send_data = 0x00;\r
+\r
+                set_system_time((char *)data);\r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_AGING_TEST,\r
+                        0x05,\r
+                        &send_data,\r
+                        1);\r
+            }\r
+\r
+\r
+            break;\r
+\r
+\r
         case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD:\r
             if(testitem == 0x01)\r
             {\r
@@ -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\r
                 uapi_soc_read_id(soc_id, 20);\r
 \r
-                for(i = 0; i < 20; i++)\r
-                    PRINT("soc_id[%d] : %2X \r\n",i,soc_id[i]);\r
-\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD,\r
                         0x11,\r

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 597d1ff..9bf5720 100755 (executable)
--- 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;
 }