蓝牙产测优化

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 87df777..1114452 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -433,7 +433,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 cycle_time_ms = data[1];\r
                 duty = data[0];\r
 \r
-                g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_leaklight_check_timer_callback, osTimerPeriodic, NULL, NULL);\r
+                g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_vibrator_check_timer_callback, osTimerPeriodic, NULL, NULL);\r
 \r
                 osTimerStart(g_ble_vibrator_timer,1000);\r
 \r
@@ -478,14 +478,14 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x02)\r
             {\r
                 //获取RTC\r
-                uint32_t send_data[64] = {0};\r
+                char send_data[64] = {0};\r
                 get_system_time(&send_data[1]);\r
-                uint16_t datalen = strlen(send_data);\r
+                uint16_t datalen = strlen(&send_data[1]);\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
-                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_VIBRATOR,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_RTC,\r
                         0x02,\r
                         &send_data,\r
-                        datalen);\r
+                        datalen+1);\r
             }\r
 \r
         case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD:\r
@@ -517,8 +517,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 uint8_t i;\r
                 //获取soc_id\r
-                uint8_t soc_id[21]; // 20 is soc id length\r
-                soc_id[0] = 0;\r
+                uint8_t soc_id[21] = {0}; // 20 is soc id length\r
                 uapi_soc_read_id(&soc_id[1], 21);\r
 \r
                 for(i = 0; i < 21; i++)\r
@@ -554,7 +553,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD,\r
                         0x01,\r
                         lcd_id,\r
-                        sizeof(lcd_id));\r
+                        3);\r
             } else if(testitem == 0x02)\r
             {\r
                 //LCD 上电\r
@@ -631,7 +630,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
         case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_TP:\r
             if(testitem == 0x01)\r
             {\r
-                //获取ID\r
+                //获取TP_ID\r
                 uint16_t id = 0;\r
                 uint8_t tp_id[3];\r
                 touch_getid(&id);\r
@@ -701,6 +700,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x04)\r
             {\r
                 //单次获得acc\r
+                PRINT("333\r\n");\r
                 uint8_t databuf[6];\r
                 get_gsensor_single(databuf);\r
 \r
@@ -713,6 +713,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x05)\r
             {\r
                 //连续获得acc\r
+                PRINT("444\r\n");\r
                 g_ble_acc_timer = osTimerNew((osTimerFunc_t)ble_acc_check_timer_callback, osTimerPeriodic, NULL, NULL);\r
                 osTimerStart(g_ble_acc_timer,1000);\r
 \r
@@ -735,7 +736,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
         case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_HRS:\r
             if(testitem == 0x01)\r
             {\r
-                //获取chip_id\r
+                //获取 hx3695 chip_id\r
                 uint8_t chip_id;\r
                 chip_id = hx3695_get_chip_id();\r
 \r
@@ -799,6 +800,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
 \r
             } else if(testitem == 0x02)\r
             {\r
+                PRINT("555\r\n");\r
                 //地磁sensor测试\r
                 float fAzimuth,fPitch,fRoll;\r
                 mmc5603_getdata(&fAzimuth,&fPitch,&fRoll);\r
@@ -814,6 +816,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 databuf[4] = (uint8_t)(((uint32_t)fRoll & 0xFF00) >> 8);\r
                 databuf[5] = (uint8_t)((uint32_t)fRoll & 0x00FF);\r
 \r
+                PRINT("fAzimuth : %f ,  fPitch : %f , fRoll : %f \r\n",fAzimuth,fPitch,fRoll);\r
                 PRINT("%2X %2X %2X %2X %2X %2X\r\n",databuf[0],databuf[1],databuf[2],databuf[3],databuf[4],databuf[5]);\r
 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
@@ -855,7 +858,6 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //获取电压\r
                 float voltage;\r
-                uint8_t i;\r
                 uint16_t vol;\r
                 battery_getvoltage(&voltage);\r
 \r
@@ -864,9 +866,6 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 send_data[1] = (vol >> 8) ;\r
                 send_data[2] = vol;\r
 \r
-                for(i = 0;i < 3 ; i++)\r
-                    PRINT("data[%d] : %X \r\n",i,send_data[i]);\r
-\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_PM,\r
                         0x04,\r
@@ -891,12 +890,20 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //获得flash_id\r
                 uint32_t id;\r
+                uint8_t flash_id[4] = {0};\r
+\r
                 flash_getid(&id);\r
+\r
+                flash_id[0] = id >> 24;\r
+                flash_id[1] = id >> 16;\r
+                flash_id[2] = id >> 8;\r
+                flash_id[3] = id >> 0;\r
+\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_EXTFLASH,\r
                         0x01,\r
-                        &id,\r
-                        sizeof(id));\r
+                        flash_id,\r
+                        4);\r
 \r
             } else if(testitem == 0x02)\r
             {\r
@@ -920,7 +927,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 uint8_t send_data = 0x01;\r
                 flash_erase();\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
-                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_PM,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_EXTFLASH,\r
                         0x05,\r
                         &send_data,\r
                         1);\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 3fc8baa..626ab26 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
@@ -181,7 +181,7 @@ uint32_t set_system_time(char* time)
     return ERRCODE_SUCC;
 }
 
-uint32_t get_system_time(uint32_t *timedata)
+uint32_t get_system_time(char *timedata)
 {
     char timebuf[TIME_MAX] = { 0 };
     struct tm tm;

diff --git a/code/sdk/application/wstp/at_service/app/app_common_api.h b/code/sdk/application/wstp/at_service/app/app_common_api.h
index bd42cf0..f5362ab 100755 (executable)
--- a/code/sdk/application/wstp/at_service/app/app_common_api.h
+++ b/code/sdk/application/wstp/at_service/app/app_common_api.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-03-13 15:08:38
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-03-30 21:22:18
+ * @LastEditTime: 2024-04-01 17:01:01
  * @FilePath: /FD230/code/sdk/application/wstp/at_service/app/app_common_api.h
  * @Description: 
  * 
@@ -40,7 +40,7 @@ int add_function(char *name, char *description, int (*func)(int argc, char *argv
 #endif
 uint32_t get_sec_time(char* time);
 uint32_t set_system_time(char* time);
-uint32_t get_system_time(uint32_t *timebuf);
+uint32_t get_system_time(char *timebuf);
 uint32_t nandflash_aging_test(char* para);
 uint32_t flash_aging_test(char* para);
 uint32_t freertos_heap_print(void);

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 2fb9034..7639e1c 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -852,7 +852,7 @@ void get_gsensor_single(uint8_t *databuf)
     databuf[4] = (uint8_t)((t->z & 0xFF00) >> 8);
     databuf[5] = (uint8_t)(t->z & 0x00FF);
 
-    PRINT("%2X %2X %2X %2X %2X %2X\r\n",databuf[0],databuf[1],databuf[2],databuf[3],databuf[4],databuf[5]);
+    PRINT("GSENSOR: %2X %2X %2X %2X %2X %2X\r\n",databuf[0],databuf[1],databuf[2],databuf[3],databuf[4],databuf[5]);
 
 }