From: SnickerSun Date: Sun, 29 Dec 2024 05:19:23 +0000 (+0800) Subject: 修复不使用hx3695，有蓝牙产测时的编译问题 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a86f22caefead33c00e6afac3943dd99fc46748d;p=mirrors%2FFD230.git 修复不使用hx3695，有蓝牙产测时的编译问题 --- diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c index 669fc3e96..ddeb388b9 100644 --- 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 * @Date: 2024-06-17 14:31:08 * @LastEditors: SnickerSun snickersun@163.com - * @LastEditTime: 2024-12-22 09:32:13 + * @LastEditTime: 2024-12-29 13:11:17 * @FilePath: /FD230/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c * @Description: * @@ -25,9 +25,12 @@ #include "button_porting.h" #include "cat1_ctl.h" #include "cat1_server.h" + +#ifdef PPG_HX3695 #include "hx3695_hrs_agc.h" #include "hx3695_spo2_agc.h" #include "hx3695_factory_test.h" +#endif #include "power_display_service.h" #include "efuse.h" #include "mag_service.h" @@ -358,14 +361,18 @@ void aging_task(void) uapi_get_timestampe_ss(¤t_time); send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST); LOS_Msleep(200); + #ifdef PPG_HX3695 FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); + #endif send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); + #ifdef PPG_HX3695 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); if(!(ft_result.gr_data_final && ft_result.red_data_final && ft_result.ir_data_final)) { aging_t.ppg_error++; aging_t.fail_num++; } + #endif PRINT("current_time - enter_time[%d]\n",current_time - enter_time); }while(current_time - enter_time <= 2 * 60); @@ -1379,14 +1386,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //打开心率检测 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST); LOS_Msleep(500); - FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); - send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); uint8_t databuf[4] = {0}; - +#ifdef PPG_HX3695 + FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24); databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16); databuf[2] = (uint8_t)((ft_result.gr_data_final & 0x0000FF00) >> 8); databuf[3] = (uint8_t)((ft_result.gr_data_final & 0x000000FF) >> 0); +#endif + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); PRINT("%2X %2X %2X %2X \r\n",databuf[0],databuf[1],databuf[2],databuf[3]); @@ -1401,15 +1409,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //打开血氧检测 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST); LOS_Msleep(500); - FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); - send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); uint8_t databuf[4] = {0}; - +#ifdef PPG_HX3695 + FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST); databuf[0] = (uint8_t)((ft_result.red_data_final & 0xFF000000) >> 24); databuf[1] = (uint8_t)((ft_result.red_data_final & 0x00FF0000) >> 16); databuf[2] = (uint8_t)((ft_result.red_data_final & 0x0000FF00) >> 8); databuf[3] = (uint8_t)((ft_result.red_data_final & 0x000000FF) >> 0); - +#endif + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); PRINT("%2X %2X %2X %2X \r\n",databuf[0],databuf[1],databuf[2],databuf[3]); factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, @@ -1423,10 +1431,9 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //灰卡测试 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_GRAYCARD_TEST); LOS_Msleep(500); - FT_RESULTS_t ft_result = hx3695_factroy_test(GRAY_CARD_TEST); - send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); uint8_t databuf[12] = {0}; - +#ifdef PPG_HX3695 + FT_RESULTS_t ft_result = hx3695_factroy_test(GRAY_CARD_TEST); databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24); databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16); databuf[2] = (uint8_t)((ft_result.gr_data_final & 0x0000FF00) >> 8); @@ -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); databuf[10] = (uint8_t)((ft_result.ir_data_final & 0x0000FF00) >> 8); databuf[11] = (uint8_t)((ft_result.ir_data_final & 0x000000FF) >> 0); - +#endif + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); PRINT("%2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X\r\n", databuf[0],databuf[1],databuf[2],databuf[3], databuf[4],databuf[5],databuf[6],databuf[7], @@ -1460,9 +1468,9 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //漏光测试 send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST); LOS_Msleep(200); - FT_RESULTS_t ft_result = hx3695_factroy_test(LEAK_LIGHT_TEST); - send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); uint8_t databuf[12] = {0}; +#ifdef PPG_HX3695 + FT_RESULTS_t ft_result = hx3695_factroy_test(LEAK_LIGHT_TEST); databuf[0] = (uint8_t)((ft_result.gr_data_final & 0xFF000000) >> 24); databuf[1] = (uint8_t)((ft_result.gr_data_final & 0x00FF0000) >> 16); @@ -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); databuf[10] = (uint8_t)((ft_result.ir_data_final & 0x0000FF00) >> 8); databuf[11] = (uint8_t)((ft_result.ir_data_final & 0x000000FF) >> 0); +#endif + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST); // PRINT("%2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X\r\n", // databuf[0],databuf[1],databuf[2],databuf[3],