修复不使用hx3695，有蓝牙产测时的编译问题

diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
index 669fc3e..ddeb388 100644 (file)
--- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com\r
  * @Date: 2024-06-17 14:31:08\r
  * @LastEditors: SnickerSun snickersun@163.com\r
- * @LastEditTime: 2024-12-22 09:32:13\r
+ * @LastEditTime: 2024-12-29 13:11:17\r
  * @FilePath: /FD230/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c\r
  * @Description: \r
  * \r
@@ -25,9 +25,12 @@
 #include "button_porting.h"\r
 #include "cat1_ctl.h"\r
 #include "cat1_server.h"\r
+\r
+#ifdef PPG_HX3695\r
 #include "hx3695_hrs_agc.h"\r
 #include "hx3695_spo2_agc.h"\r
 #include "hx3695_factory_test.h"\r
+#endif\r
 #include "power_display_service.h"\r
 #include "efuse.h"\r
 #include "mag_service.h"\r
@@ -358,14 +361,18 @@ void aging_task(void)
             uapi_get_timestampe_ss(&current_time);\r
             send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);\r
             LOS_Msleep(200);\r
+            #ifdef PPG_HX3695\r
             FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
+            #endif\r
             send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
+            #ifdef PPG_HX3695\r
             PRINT("ft_result.gr_data_final : %d , ft_result.red_data_final : %d , ft_result.ir_data_final : %d\r\n",ft_result.gr_data_final,ft_result.red_data_final,ft_result.ir_data_final);\r
             if(!(ft_result.gr_data_final && ft_result.red_data_final && ft_result.ir_data_final))\r
             {\r
                 aging_t.ppg_error++;\r
                 aging_t.fail_num++;\r
             }\r
+            #endif\r
             PRINT("current_time -  enter_time[%d]\n",current_time -  enter_time);\r
         }while(current_time - enter_time <= 2 * 60);\r
 \r
@@ -1379,14 +1386,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //打开心率检测\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
-\r
+#ifdef PPG_HX3695\r
+                FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
                 databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24);\r
                 databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16);\r
                 databuf[2] = (uint8_t)((ft_result.gr_data_final & 0x0000FF00) >> 8);\r
                 databuf[3] = (uint8_t)((ft_result.gr_data_final & 0x000000FF) >> 0);\r
+#endif\r
+            send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
 \r
             PRINT("%2X %2X %2X %2X \r\n",databuf[0],databuf[1],databuf[2],databuf[3]);\r
 \r
@@ -1401,15 +1409,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //打开血氧检测\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
-\r
+#ifdef PPG_HX3695\r
+                FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
                 databuf[0] = (uint8_t)((ft_result.red_data_final & 0xFF000000) >> 24);\r
                 databuf[1] = (uint8_t)((ft_result.red_data_final & 0x00FF0000) >> 16);\r
                 databuf[2] = (uint8_t)((ft_result.red_data_final & 0x0000FF00) >> 8);\r
                 databuf[3] = (uint8_t)((ft_result.red_data_final & 0x000000FF) >> 0);\r
-\r
+#endif\r
+                send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 PRINT("%2X %2X %2X %2X \r\n",databuf[0],databuf[1],databuf[2],databuf[3]);\r
 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
@@ -1423,10 +1431,9 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //灰卡测试\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
-\r
+#ifdef PPG_HX3695\r
+                FT_RESULTS_t ft_result = hx3695_factroy_test(GRAY_CARD_TEST);\r
                 databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24);\r
                 databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16);\r
                 databuf[2] = (uint8_t)((ft_result.gr_data_final & 0x0000FF00) >> 8);\r
@@ -1441,7 +1448,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 databuf[9] = (uint8_t)((ft_result.ir_data_final & 0x00FF0000) >> 16);\r
                 databuf[10] = (uint8_t)((ft_result.ir_data_final & 0x0000FF00) >> 8);\r
                 databuf[11] = (uint8_t)((ft_result.ir_data_final & 0x000000FF) >> 0);\r
-\r
+#endif\r
+                send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
                 PRINT("%2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X\r\n",\r
                 databuf[0],databuf[1],databuf[2],databuf[3],\r
                 databuf[4],databuf[5],databuf[6],databuf[7],\r
@@ -1460,9 +1468,9 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 //漏光测试\r
                 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST);\r
                 LOS_Msleep(200);\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
+#ifdef PPG_HX3695\r
+                FT_RESULTS_t ft_result = hx3695_factroy_test(LEAK_LIGHT_TEST);\r
 \r
                 databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24);\r
                 databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16);\r
@@ -1478,6 +1486,8 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
                 databuf[9] = (uint8_t)((ft_result.ir_data_final & 0x00FF0000) >> 16);\r
                 databuf[10] = (uint8_t)((ft_result.ir_data_final & 0x0000FF00) >> 8);\r
                 databuf[11] = (uint8_t)((ft_result.ir_data_final & 0x000000FF) >> 0);\r
+#endif\r
+                send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
 \r
                 // PRINT("%2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X\r\n",\r
                 // databuf[0],databuf[1],databuf[2],databuf[3],\r