优化蓝牙产测马达测试，4G测试，优化心率初始化

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 2bffc86..bd29009 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com\r
  * @Date: 2024-06-17 14:31:08\r
  * @LastEditors: penglei 1624952103@qq.com\r
- * @LastEditTime: 2025-01-06 16:20:03\r
+ * @LastEditTime: 2025-01-08 11:44:08\r
  * @FilePath: /FD230/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c\r
  * @Description: \r
  * \r
@@ -763,9 +763,11 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //打开马达\r
                 uint8_t send_data = 0x00;\r
 \r
-                g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_vibrator_check_timer_callback, osTimerPeriodic, NULL, NULL);\r
+                if(g_ble_vibrator_timer == NULL)\r
+                    g_ble_vibrator_timer = osTimerNew((osTimerFunc_t)ble_vibrator_check_timer_callback, osTimerPeriodic, NULL, NULL);\r
 \r
-                osTimerStart(g_ble_vibrator_timer,500);\r
+                if(g_ble_vibrator_timer)\r
+                    osTimerStart(g_ble_vibrator_timer,500);\r
                 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_VIBRATOR,\r
@@ -778,8 +780,9 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //关闭马达\r
                 uint8_t send_data = 0x00;\r
 \r
-                osTimerStop(g_ble_vibrator_timer);\r
-                osTimerDelete(g_ble_vibrator_timer);\r
+                if(g_ble_vibrator_timer)\r
+                    osTimerStop(g_ble_vibrator_timer);\r
+                // osTimerDelete(g_ble_vibrator_timer);\r
 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_VIBRATOR,\r
@@ -1787,7 +1790,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //设置强收模式\r
                 uint8_t send_data = 0;\r
                 cat1_at_cmd("at+QRFTESTMODE=1");\r
-                LOS_Msleep(500);\r
+                LOS_Msleep(1000);\r
                 ble_get_cat1_at_msg((char *)&send_data,1);\r
                 if(atol(send_data) == 0)\r
                     send_data = 1;\r
@@ -1804,7 +1807,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 char buf[20] = {0};\r
                 uint8_t send_data[2] = {0};\r
                 cat1_at_cmd("AT+QRXFTM=\"LTE BAND1\",300,\"on\",75");\r
-                LOS_Msleep(500);\r
+                LOS_Msleep(1000);\r
                 ble_get_cat1_at_msg(buf,20);\r
                 sscanf(buf, "+QRXFTM: -%d,-%d", (int *)&send_data[0], (int *)&send_data[1]);\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
@@ -1817,7 +1820,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //关闭强接受\r
                 uint8_t send_data = 0;\r
                 cat1_at_cmd("AT+QRXFTM=\"LTE BAND1\",300,\"off\",75");\r
-                LOS_Msleep(500);\r
+                LOS_Msleep(1000);\r
                 ble_get_cat1_at_msg((char *)&send_data,1);\r
                 if(atol(send_data) == 0)\r
                     send_data = 1;\r

diff --git a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp
index 9ca14e4..939918e 100644 (file)
--- a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp
+++ b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp
@@ -400,10 +400,16 @@ errcode_t uapi_ppg_service_init(void)
     tyhx_poweron();
     if ( hx3695_chip_check() == false)
     {
-        //TODO 没找到3695，退出线程
-        PRINT("3695 not exist!\r\n");
         tyhx_poweroff();
-        return ERRCODE_FAIL;
+        LOS_Mdelay(10);
+        tyhx_poweron();
+        if ( hx3695_chip_check() == false)
+        {
+            //TODO 没找到3695，退出线程
+            PRINT("3695 not exist!\r\n");
+            tyhx_poweroff();
+            return ERRCODE_FAIL;
+        }
     }
     tyhx_poweroff();
     hx3695_register_msg_callback(hx3695_msg_callback);//注册驱动回调