优化蓝牙产测心率血氧漏光测试与LCD TP CROWN测试

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 4f55404..102de96 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -999,8 +999,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //退出lcd测试\r
                 uint8_t send_data = 0;\r
-                uint8_t cmd = 0;\r
-                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_LCD_TEST,&cmd,sizeof(cmd));\r
+                //uint8_t cmd = 0;\r
+                //do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_LCD_TEST,&cmd,sizeof(cmd));\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD,\r
                         0x07,\r
@@ -1058,8 +1058,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //退出触摸测试\r
                 uint8_t send_data = 0;\r
-                uint8_t cmd = 0;\r
-                do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_TP_TEST,&cmd,sizeof(cmd));\r
+                //uint8_t cmd = 0;\r
+                //do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_TYPE_TP_TEST,&cmd,sizeof(cmd));\r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_TP,\r
                         0x04,\r
@@ -1173,6 +1173,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //打开心率检测\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);\r
+                LOS_Msleep(500);\r
                 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 uint8_t databuf[4] = {0};\r
@@ -1194,6 +1195,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //打开血氧检测\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);\r
+                LOS_Msleep(500);\r
                 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 uint8_t databuf[4] = {0};\r
@@ -1215,6 +1217,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //灰卡测试\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_GRAYCARD_TEST);\r
+                LOS_Msleep(500);\r
                 FT_RESULTS_t ft_result = hx3695_factroy_test(GRAY_CARD_TEST);\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 uint8_t databuf[12] = {0};\r
@@ -1251,6 +1254,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
             {\r
                 //漏光测试\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST);\r
+                LOS_Msleep(500);\r
                 FT_RESULTS_t ft_result = hx3695_factroy_test(LEAK_LIGHT_TEST);\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 uint8_t databuf[12] = {0};\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
index 85c675f..5618ec9 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
+++ b/code/sdk/drivers/peripheral/utils/custom_cmd_service.c
@@ -168,8 +168,8 @@ static void custom_cmd_service_check_task(void const *arg)
         case CUSTOM_CMD_MSG_TYPE_TP_TEST:
             if(mail.data[0] == 1)
             {
-                uapi_set_screen_on_api();
-                uapi_factorytest_enter_test_view(1);
+                //uapi_set_screen_on_api();
+                //uapi_factorytest_enter_test_view(1);
                 uapi_factorytest_enter_test_tp_view();
                 uapi_factorytest_hide_test_tp_button();
             }
@@ -181,8 +181,8 @@ static void custom_cmd_service_check_task(void const *arg)
         case CUSTOM_CMD_MSG_TYPE_CROWN_TEST:
             if(mail.data[0] == 1)
             {
-                uapi_set_screen_on_api();
-                uapi_factorytest_enter_test_view(1);
+                //uapi_set_screen_on_api();
+                //uapi_factorytest_enter_test_view(1);
                 uapi_factorytest_enter_test_button_view();
             }
             else