From: penglei <1624952103@qq.com>
Date: Mon, 1 Apr 2024 11:12:20 +0000 (+0800)
Subject: 蓝牙产测优化
X-Git-Tag: release_V1.2.70_20241020_135402~1240
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=5192f79bf238e89f5efae9876c9de507c597f2fe;p=mirrors%2FFD230.git

蓝牙产测优化
---

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 87df77735..111445212 100644
--- 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];
                 duty = data[0];
 
-                g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_leaklight_check_timer_callback, osTimerPeriodic, NULL, NULL);
+                g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_vibrator_check_timer_callback, osTimerPeriodic, NULL, NULL);
 
                 osTimerStart(g_ble_vibrator_timer,1000);
 
@@ -478,14 +478,14 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x02)
             {
                 //获取RTC
-                uint32_t send_data[64] = {0};
+                char send_data[64] = {0};
                 get_system_time(&send_data[1]);
-                uint16_t datalen = strlen(send_data);
+                uint16_t datalen = strlen(&send_data[1]);
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
-                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_VIBRATOR,
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_RTC,
                         0x02,
                         &send_data,
-                        datalen);
+                        datalen+1);
             }
 
         case BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CUSTOM_CMD:
@@ -517,8 +517,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 uint8_t i;
                 //获取soc_id
-                uint8_t soc_id[21]; // 20 is soc id length
-                soc_id[0] = 0;
+                uint8_t soc_id[21] = {0}; // 20 is soc id length
                 uapi_soc_read_id(&soc_id[1], 21);
 
                 for(i = 0; i < 21; i++)
@@ -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,
                         0x01,
                         lcd_id,
-                        sizeof(lcd_id));
+                        3);
             } else if(testitem == 0x02)
             {
                 //LCD 上电
@@ -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:
             if(testitem == 0x01)
             {
-                //获取ID
+                //获取TP_ID
                 uint16_t id = 0;
                 uint8_t tp_id[3];
                 touch_getid(&id);
@@ -701,6 +700,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x04)
             {
                 //单次获得acc
+                PRINT("333\r\n");
                 uint8_t databuf[6];
                 get_gsensor_single(databuf);
 
@@ -713,6 +713,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             } else if(testitem == 0x05)
             {
                 //连续获得acc
+                PRINT("444\r\n");
                 g_ble_acc_timer = osTimerNew((osTimerFunc_t)ble_acc_check_timer_callback, osTimerPeriodic, NULL, NULL);
                 osTimerStart(g_ble_acc_timer,1000);
 
@@ -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:
             if(testitem == 0x01)
             {
-                //获取chip_id
+                //获取 hx3695 chip_id
                 uint8_t chip_id;
                 chip_id = hx3695_get_chip_id();
 
@@ -799,6 +800,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
 
             } else if(testitem == 0x02)
             {
+                PRINT("555\r\n");
                 //地磁sensor测试
                 float fAzimuth,fPitch,fRoll;
                 mmc5603_getdata(&fAzimuth,&fPitch,&fRoll);
@@ -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);
                 databuf[5] = (uint8_t)((uint32_t)fRoll & 0x00FF);
 
+                PRINT("fAzimuth : %f ,  fPitch : %f , fRoll : %f \r\n",fAzimuth,fPitch,fRoll);
                 PRINT("%2X %2X %2X %2X %2X %2X\r\n",databuf[0],databuf[1],databuf[2],databuf[3],databuf[4],databuf[5]);
 
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
@@ -855,7 +858,6 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //获取电压
                 float voltage;
-                uint8_t i;
                 uint16_t vol;
                 battery_getvoltage(&voltage);
 
@@ -864,9 +866,6 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 send_data[1] = (vol >> 8) ;
                 send_data[2] = vol;
 
-                for(i = 0;i < 3 ; i++)
-                    PRINT("data[%d] : %X \r\n",i,send_data[i]);
-
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_PM,
                         0x04,
@@ -891,12 +890,20 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {
                 //获得flash_id
                 uint32_t id;
+                uint8_t flash_id[4] = {0};
+
                 flash_getid(&id);
+
+                flash_id[0] = id >> 24;
+                flash_id[1] = id >> 16;
+                flash_id[2] = id >> 8;
+                flash_id[3] = id >> 0;
+
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_EXTFLASH,
                         0x01,
-                        &id,
-                        sizeof(id));
+                        flash_id,
+                        4);
 
             } else if(testitem == 0x02)
             {
@@ -920,7 +927,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 uint8_t send_data = 0x01;
                 flash_erase();
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,
-                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_PM,
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_EXTFLASH,
                         0x05,
                         &send_data,
                         1);
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 3fc8baaf9..626ab26b0 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
@@ -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 bd42cf016..f5362ab67 100755
--- 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 2fb903452..7639e1cb9 100644
--- 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]);
 
 }