添加hx3695驱动编译通过,移植未完成
authorSnickerSun <snickersun@163.com>
Fri, 29 Dec 2023 11:27:51 +0000 (19:27 +0800)
committerSnickerSun <snickersun@163.com>
Fri, 29 Dec 2023 11:27:51 +0000 (19:27 +0800)
15 files changed:
code/sdk/build/config/target_config/brandy/config.py
code/sdk/drivers/peripheral/ppg/CMakeLists.txt
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.h
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_factory_test.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.h
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_custom.c [new file with mode: 0644]
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrv_agc.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_spo2_agc.c
code/sdk/drivers/peripheral/ppg/hx3695/libhx3695.a [new file with mode: 0644]
code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_alg.h
code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h [new file with mode: 0644]
code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrv_alg.h
code/sdk/drivers/peripheral/ppg/hx3695/tyhx_spo2_alg.h

index 1adbac5..32dd371 100755 (executable)
@@ -116,6 +116,7 @@ target = {
                     'CONFIG_LOW_POWER_TEST',
                     'ENABLE_ECC',
                     'FT_SINGLE_UART',
+                    'PPG_HX3695',
                     #'CONFIG_ADC_SUPPORT_AUTO_SCAN','CONFIG_ADC_SUPPORT_LONG_SAMPLE',
                     'MIPI_ULPS_SUPPORT', 'TPTYPE_FT6X46'],
         'ram_component': ["algorithm", "dfx_port_brandy", "dfx_update", 'dfx_nv', "osal", "arch_port", "-:testsuite",
@@ -124,7 +125,9 @@ target = {
                           'ulp_aon', 'hal_l2ram',
                           'x_dpal', 'x_vfs', 'x_disk', 'x_fat', 'drv_mmc', 'fs_yaffs2', 'x_vfs_private',
                           'pm_service', 'pm_brandy', 'cmn_header', 'at_cmd', 'graphic_at_service', 'app_at_service', 'ohosfwk_at_service',
-                          "audio_proc", "audio_dump", "audio_probe", "power_manager", "gpu_proc","batterry_service"],
+                          "audio_proc", "audio_dump", "audio_probe", "power_manager", "gpu_proc",
+                          "ppg_sensor",
+                          "batterry_service"],
         'ram_component_set': ['bgh', 'media', 'gpu', 'graphic_uikit', 'bgh_audio', 'dfx_set', 'ohos_set', 'wearable_set', 'alipay_set'],
         'dsp_version': 'max',
         'packet': True,
index f0d8850..8d59792 100644 (file)
@@ -4,13 +4,29 @@
 #===============================================================================
 set(COMPONENT_NAME "ppg_sensor")
 
-set(SOURCES
-    ${CMAKE_CURRENT_SOURCE_DIR}/button.c
+if("PPG_HX3695" IN_LIST DEFINES)
+set(SOURCES ${SOURCES}
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_check_touch.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_factory_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_hrs_agc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_hrv_agc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_spo2_agc.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695/hx3695_hrs_custom.c
+)
+set(PUBLIC_HEADER
+    ${CMAKE_CURRENT_SOURCE_DIR}/hx3695
 )
 
+else()
+set(SOURCES ${SOURCES}
+    # ${CMAKE_CURRENT_SOURCE_DIR}/ztw523_touch/ztw523_ctrl.c
+)
 set(PUBLIC_HEADER
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
+endif()
+
 
 set(PRIVATE_HEADER
 )
@@ -37,3 +53,6 @@ set(MAIN_COMPONENT
 )
 
 build_component()
+
+find_library(LIB_PATH_HX3695 hx3695/libhx3695.a ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(${TARGET_NAME} PRIVATE -Wl,--whole-archive ${LIB_PATH_HX3695} PRIVATE -Wl,--whole-archive)
\ No newline at end of file
index 75b6706..38aabca 100644 (file)
@@ -5,7 +5,7 @@
 #include <math.h>\r
 \r
 #include "tyhx_hrs_custom.h"\r
-#include "tyhx_mems.h"\r
+// #include "tyhx_mems.h"\r
 \r
 #ifdef CHIP_HX3695\r
 #include "hx3695.h"\r
 #endif\r
 #include "hx3695_factory_test.h"\r
 \r
+FT_CUSTOM_RESULTS_t hrsresult ={0};\r
 \r
+int16_t gsen_fifo_x[64]={0};\r
+int16_t gsen_fifo_y[64]={0};\r
+int16_t gsen_fifo_z[64]={0};\r
 \r
 #ifdef SPO2_VECTOR\r
 #include "spo2_vec.h"\r
@@ -133,7 +137,9 @@ static int32_t ir_jump_delta = 0;
 static int32_t cali_data_cnt = 0;\r
 #endif\r
 \r
-// us ÑÓʱº¯Êý£¬ ¿Í»§ÐèÌîд\r
+\r
+\r
+// us 延时函数, 客户需填写\r
 void hx3695_delay_us(uint32_t us)\r
 {\r
     tyhx_delay_us(us);\r
@@ -145,7 +151,7 @@ void hx3695_delay_ms(uint32_t ms)
     tyhx_delay_ms(ms);\r
 }\r
 \r
-// i2c Ð´º¯Êý£¬ ¿Í»§ÐèÌîд, µØÖ·0x44(7bit)\r
+// i2c 写函数, 客户需填写, 地址0x44(7bit)\r
 bool hx3695_write_reg(uint8_t addr, uint8_t data)\r
 {\r
 \r
@@ -153,7 +159,7 @@ bool hx3695_write_reg(uint8_t addr, uint8_t data)
     return true;\r
 }\r
 \r
-// i2c ¶Áº¯Êý£¬ ¿Í»§ÐèÌîд\r
+// i2c 读函数, 客户需填写\r
 uint8_t hx3695_read_reg(uint8_t addr)\r
 {\r
     uint8_t data_buf = 0;\r
@@ -162,7 +168,7 @@ uint8_t hx3695_read_reg(uint8_t addr)
     return data_buf;\r
 }\r
 \r
-// i2c Á¬¶Áº¯Êý£¬ ¿Í»§ÐèÌîд\r
+// i2c 连读函数, 客户需填写\r
 bool hx3695_brust_read_reg(uint8_t addr, uint8_t *buf, uint8_t length)\r
 {\r
     //TYHX_LOG("brust read\r\n");\r
@@ -195,7 +201,7 @@ uint32_t gsen_read_timers_stop(void)
 }\r
 \r
 \r
-/* Íê³É¶ÁÈ¡PPGÊý¾Ý¶¨Ê±Æ÷½Ó¿Ú£¬ Ñ­»·µ÷Ó㬠ĬÈÏ320ms\r
+/* 完成读取PPG数据定时器接口, 循环调用, 默认320ms\r
 void heart_rate_meas_timeout_handler(void * p_context)\r
 */\r
 void hx3695_320ms_timer_cfg(bool en)\r
@@ -224,7 +230,7 @@ void hx3695_40ms_timer_cfg(bool en)
 }\r
 \r
 #if defined(INT_MODE)\r
-/* Èç²ÉÓÃÖжÏģʽ£¬ ÈçÍê³ÉÖжϿªÆôºÍ¹Ø±Õ½Ó¿Ú\r
+/* 如采用中断模式, 如完成中断开启和关闭接口\r
 void hx3695_ppg_Int_handle(void)\r
 */\r
 void hx3695_gpioint_cfg(bool en)\r
@@ -400,7 +406,7 @@ void hx3695_data_reset(void)
 }\r
 \r
 #ifdef HRS_ALG_LIB\r
-// ÐÄÂÊģʽÏÂppg ³õʼ»¯ÅäÖÃ\r
+// 心率模式下ppg 初始化配置\r
 void hx3695_hrs_ppg_init(void) // ppg fs=25hz, phase conversion ready interupt en\r
 {\r
     uint16_t sample_rate = 25;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
@@ -635,9 +641,9 @@ void hx3695_hrs_ppg_init(void) // ppg fs=25hz, phase conversion ready interupt e
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -808,9 +814,9 @@ void hx3695_hrs_ppg_init(void) // ppg fs=25hz, phase conversion ready interupt e
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble                                                                             \r
+                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble                                                                          \r
      hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
      \r
 #endif\r
@@ -830,7 +836,7 @@ void hx3695_hrs_ppg_init(void) // ppg fs=25hz, phase conversion ready interupt e
 #endif\r
 \r
 #ifdef SPO2_ALG_LIB\r
-// ÑªÑõģʽÏ ³õʼ»¯ÅäÖÃ\r
+// 血氧模式下 初始化配置\r
 void hx3695_spo2_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion ready interupt en\r
 {\r
      uint16_t sample_rate = 25;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
@@ -1067,9 +1073,9 @@ void hx3695_spo2_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -1236,9 +1242,9 @@ void hx3695_spo2_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-               hx3695_write_reg(0X1b, 0x91);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+               hx3695_write_reg(0X1b, 0x91);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble  \r
      hx3695_write_reg(0X36, 0x00);                                                                                                                                                             \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
@@ -1263,7 +1269,7 @@ void hx3695_spo2_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion
 #endif\r
 \r
 #ifdef HRV_ALG_LIB\r
-// HRVģʽÏ ³õʼ»¯ÅäÖÃ\r
+// HRV模式下 初始化配置\r
 void hx3695_hrv_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion ready interupt en\r
 {\r
    uint16_t sample_rate = 125;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
@@ -1498,9 +1504,9 @@ void hx3695_hrv_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion r
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -1667,9 +1673,9 @@ void hx3695_hrv_ppg_init(void) //20200615 ericy ppg fs=25hz, phase3 conversion r
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-               hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+               hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble  \r
      hx3695_write_reg(0X36, 0x00);                                                                                                                                                             \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
@@ -1929,9 +1935,9 @@ void hx3695_check_touch_init(void) //
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -2098,9 +2104,9 @@ void hx3695_check_touch_init(void) //
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble  \r
      hx3695_write_reg(0X36, 0x00);                       //intrupt                                                                                                                                     \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
@@ -2123,7 +2129,7 @@ void hx3695_check_touch_init(void) //
 }\r
 #endif\r
 \r
-// ³õʼ»¯µ÷ÓÃÈë¿Úº¯Êý\r
+// 初始化调用入口函数\r
 bool hx3695_init(WORK_MODE_T mode)\r
 {\r
     work_mode_flag = mode;\r
@@ -2389,14 +2395,24 @@ void hx3695_ppg_Int_handle(void)
 \r
 \r
 #ifdef HRS_ALG_LIB\r
-/*TYHX ÐÄÂÊģʽÏ ¶ÁÈ¡PPG£¬ Ä¬ÈÏ320ms*/\r
+/*TYHX 心率模式下 读取PPG, 默认320ms*/\r
 hrs_sensor_data_t   hrs_s_dat;\r
 //hx3695_results_t    alg_results_pre;\r
-\r
+/***\r
+ * typedef struct {\r
+       hrs_alg_msg_code_t  hrs_alg_status;\r
+    living_msg_code_t   living_status;\r
+       uint32_t            data_cnt;\r
+       uint8_t             hr_result;\r
+       uint16_t            cal_result;\r
+       uint8_t             hr_result_qual;\r
+    uint32_t            hr_result_std;\r
+} hrs_results_t;\r
+*/\r
 void hx3695_hrs_ppg_Int_handle(void)\r
 {\r
     uint8_t     ii=0;\r
-    hrs_results_t   alg_results = {MSG_HRS_ALG_NOT_OPEN,0,0,0,0};\r
+    hrs_results_t   alg_results = {MSG_HRS_ALG_NOT_OPEN,0,0,0,0,0,0};\r
     hrs_wear_msg_code_t     hrs_wear_status = MSG_HRS_NO_WEAR;\r
     int32_t     *PPG_buf = &(hrs_s_dat.green_data[0]);\r
     int32_t    *ir_buf = &(hrs_s_dat.ir_data[0]);\r
@@ -2406,8 +2422,8 @@ void hx3695_hrs_ppg_Int_handle(void)
     int16_t    gsen_fifo_y_send[32]= {0};\r
     int16_t    gsen_fifo_z_send[32]= {0};\r
                \r
-                       HRS_CAL_SET_T cal;\r
-        cal = get_hrs_agc_status();\r
+               HRS_CAL_SET_T cal;\r
+    cal = get_hrs_agc_status();\r
 \r
 #ifdef HR_VECTOR\r
     for(ii=0; ii<8; ii++)\r
@@ -2689,11 +2705,33 @@ int32_t hx3695_ir_data_cali(int32_t ir_new_raw_data)
 //#ifdef SPO2_ALG_LIB\r
 spo2_sensor_data_t spo2_s_dat;\r
 \r
-/*TYHX ÑªÑõģʽÏ ¶ÁÈ¡PPG£¬ Ä¬ÈÏ320ms*/\r
+/****\r
+ * \r
+typedef struct {\r
+    spo2_alg_msg_code_t                spo2_alg_status;\r
+    spo2_living_code_t      spo2_living_status;\r
+    uint32_t           data_cnt;\r
+    uint8_t                    spo2_result;\r
+    uint8_t                    hr_result;\r
+    uint8_t                    block_cnt;\r
+    uint8_t                    ir_quality;\r
+    uint16_t           reliable_score_result;\r
+\r
+    uint8_t                    screen_up;\r
+    uint8_t                    motion;\r
+    uint8_t                    poor_signal;\r
+    \r
+    uint8_t         signal_snr;\r
+    uint32_t        signal_std;\r
+    \r
+} spo2_results_t;\r
+\r
+*/\r
+/*TYHX 血氧模式下 读取PPG, 默认320ms*/\r
 void hx3695_spo2_ppg_Int_handle(void)\r
 {\r
     uint8_t     ii=0;\r
-    spo2_results_t spo2_alg_results = {MSG_SPO2_ALG_NOT_OPEN,0,0,0,0,0,0,1,0,0};\r
+    spo2_results_t spo2_alg_results = {MSG_SPO2_ALG_NOT_OPEN,0,0,0,0,0,0,1,0,0,0,0,0};\r
     spo2_wear_msg_code_t spo2_wear_status = MSG_SPO2_NO_WEAR;\r
     SPO2_CAL_SET_T cal = get_spo2_agc_status();\r
     int32_t     *red_buf = &(spo2_s_dat.red_data[0]);\r
@@ -2797,8 +2835,8 @@ spo2_sensor_data_t  hrspo2_s_data;
 void hx3695_hrspo2_ppg_Int_handle(void)\r
 {\r
     uint8_t     ii=0;\r
-    spo2_results_t  spo2_alg_results = {MSG_SPO2_ALG_NOT_OPEN,0,0,0,0,0,0};\r
-    hrs_results_t   alg_results = {MSG_HRS_ALG_NOT_OPEN,0,0,0,0};\r
+    spo2_results_t  spo2_alg_results = {MSG_SPO2_ALG_NOT_OPEN,0,0,0,0,0,0,0,0,0,0,0,0};\r
+    hrs_results_t   alg_results = {MSG_HRS_ALG_NOT_OPEN,0,0,0,0,0,0};\r
     spo2_wear_msg_code_t spo2_wear_status = MSG_SPO2_NO_WEAR;\r
     SPO2_CAL_SET_T cal = get_spo2_agc_status();\r
     int32_t *red_buf = &(hrspo2_s_data.red_data[0]);\r
@@ -2812,7 +2850,7 @@ void hx3695_hrspo2_ppg_Int_handle(void)
     int32_t red_data_cali, ir_data_cali;\r
 #endif\r
 \r
-    if(hx3695_spo2_read(&hrspo2_s_data) == NULL)\r
+    if(hx3695_spo2_read(&hrspo2_s_data) == 0)\r
     {\r
         return;\r
     }\r
index a2ac8ce..1a5b561 100644 (file)
@@ -4,23 +4,23 @@
 #include <stdbool.h>\r
 \r
 /********************* alg_swi *********************\r
-HRS_ALG_LIB   ÐÄÂʹ¦ÄÜ\r
-SPO2_ALG_LIB  ÑªÑõ¹¦ÄÜ\r
-HRV_ALG_LIB   HRV¹¦ÄÜ\r
-CHECK_TOUCH_LIB   ´¿Åå´÷¹¦ÄÜ£¨·ÇÐÄÂÊѪÑõģʽ£©\r
-CHECK_LIVING_LIB  ´¿ÎïÌåʶ±ð¹¦ÄÜ£¨·ÇÐÄÂÊѪÑõģʽ£©\r
-BP_CUSTDOWN_ALG_LIB  ÑªÑ¹¹¦ÄÜ\r
-\r
-TIMMER_MODE  ¶¨Ê±Æ÷ģʽ£¬ ¶ÁPPGÊý¾Ý£¬ Ä¬ÈϲÉÓö¨Ê±Æ÷ģʽ\r
-INT_MODE     ÖжÏģʽ£¬¶ÁPPGÊý¾Ý\r
-\r
-DEMO_MI      demoÏà¹ØÅäÖ㬠¿Í»§¹Ø±Õ£¬ ÔÚÏÂÃæelseÀï½øÐÐÅäÖÃ\r
-HRS_BLE_APP  DEMOÀ¶ÑÀ¿ØÖƺ꣬ ¿Í»§¹Ø±Õ\r
-SPO2_DATA_CALI   ÑªÑõDC²¹³¥Ä£Ê½£¬ ¿Í»§¹Ø±Õ\r
-HRS_DEBUG    µ÷ÊԺ꣬ ¸ù¾Ýƽ̨¶¨Òå´òÓ¡º¯Êý\r
-AGC_DEBUG    µ÷ÊԺ꣬ ¸ù¾Ýƽ̨¶¨Òå´òÓ¡º¯Êý\r
-GSEN_40MS_TIMMER   DEMOµ÷ÊÔʹÓ㬠¿Í»§¹Ø±Õ\r
-NEW_GSEN_SCHME     DEMOµ÷ÊÔʹÓ㬠¿Í»§¹Ø±Õ\r
+HRS_ALG_LIB   心率功能\r
+SPO2_ALG_LIB  血氧功能\r
+HRV_ALG_LIB   HRV功能\r
+CHECK_TOUCH_LIB   纯佩戴功能(非心率血氧模式)\r
+CHECK_LIVING_LIB  纯物体识别功能(非心率血氧模式)\r
+BP_CUSTDOWN_ALG_LIB  血压功能\r
+\r
+TIMMER_MODE  定时器模式, 读PPG数据, 默认采用定时器模式\r
+INT_MODE     中断模式,读PPG数据\r
+\r
+DEMO_MI      demo相关配置, 客户关闭, 在下面else里进行配置\r
+HRS_BLE_APP  DEMO蓝牙控制宏, 客户关闭\r
+SPO2_DATA_CALI   血氧DC补偿模式, 客户关闭\r
+HRS_DEBUG    调试宏, 根据平台定义打印函数\r
+AGC_DEBUG    调试宏, 根据平台定义打印函数\r
+GSEN_40MS_TIMMER   DEMO调试使用, 客户关闭\r
+NEW_GSEN_SCHME     DEMO调试使用, 客户关闭\r
 */\r
 #define HRS_ALG_LIB   \r
 #define SPO2_ALG_LIB\r
index 4ab6f2f..9b2b56f 100644 (file)
@@ -242,9 +242,9 @@ void hx3695_factory_wear_mode_config(void)
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -415,9 +415,9 @@ void hx3695_factory_wear_mode_config(void)
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble                                                                             \r
+                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                      //  0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                      //  bits<7> fifo enble                                                                           \r
      hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
      \r
 #endif\r
@@ -438,7 +438,7 @@ void hx3695_factory_wear_mode_config(void)
        \r
 }\r
 \r
-void hx3695_factory_ft_card_test_config(void)//»Ò¿¨15mm¸ß¶È²âÊÔÅäÖÃ\r
+void hx3695_factory_ft_card_test_config(void)//灰卡15mm高度测试配置\r
 {\r
          uint16_t sample_rate = 25;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
     uint32_t prf_clk_num = 32000/sample_rate;   /*period in clk num, num = Fclk/fs */\r
@@ -674,9 +674,9 @@ void hx3695_factory_ft_card_test_config(void)//
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -843,9 +843,9 @@ void hx3695_factory_ft_card_test_config(void)//
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                    // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                    // bits<7> fifo enble      \r
      hx3695_write_reg(0X36, 0x00);                       //intrupt                                                                                                                                     \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
@@ -865,7 +865,7 @@ void hx3695_factory_ft_card_test_config(void)//
     return ;   \r
 }\r
 \r
-void hx3695_factory_ft_single_check_config(void)//»Ò¿¨10mm¸ß¶È²âÊÔÅäÖÃ\r
+void hx3695_factory_ft_single_check_config(void)//灰卡10mm高度测试配置\r
 {\r
 \r
        uint16_t sample_rate = 200;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
@@ -1099,9 +1099,9 @@ void hx3695_factory_ft_single_check_config(void)//
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -1272,9 +1272,9 @@ void hx3695_factory_ft_single_check_config(void)//
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble                                                                             \r
+                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble                                                                          \r
      hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
      \r
 #endif\r
@@ -1292,7 +1292,7 @@ void hx3695_factory_ft_single_check_config(void)//
     return ;\r
 }\r
 \r
-void hx3695_factory_ft_leak_light_test_config(void)//©¹â²âÊÔÅäÖÃ\r
+void hx3695_factory_ft_leak_light_test_config(void)//漏光测试配置\r
 {\r
     uint16_t sample_rate = 25;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
     uint32_t prf_clk_num = 32000/sample_rate;   /*period in clk num, num = Fclk/fs */\r
@@ -1528,9 +1528,9 @@ void hx3695_factory_ft_leak_light_test_config(void)//©
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -1697,9 +1697,9 @@ void hx3695_factory_ft_leak_light_test_config(void)//©
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-               hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+               hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble  \r
      hx3695_write_reg(0X36, 0x00);                       //intrupt                                                                                                                                     \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
@@ -1952,9 +1952,9 @@ void hx3695_factory_led_off_config(void)
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -2125,9 +2125,9 @@ void hx3695_factory_led_off_config(void)
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble                                                                             \r
+                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble                                                                          \r
      hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
      \r
 #endif\r
@@ -2145,7 +2145,7 @@ void hx3695_factory_led_off_config(void)
     return ;\r
 }\r
 \r
-void hx3695_factory_ft_int_test_config(void)//ÖжϲâÊÔÅäÖÃ\r
+void hx3695_factory_ft_int_test_config(void)//中断测试配置\r
 {\r
            uint16_t sample_rate = 25;                  /*config the data rate of chip alps2_fm ,uint is Hz*/\r
     uint32_t prf_clk_num = 32000/sample_rate;   /*period in clk num, num = Fclk/fs */\r
@@ -2378,9 +2378,9 @@ void hx3695_factory_ft_int_test_config(void)//
 \r
 \r
     hx3695_write_reg(0X31, (led_on_time<<4| 0x00));\r
-               hx3695_write_reg(0X33, 0x83);// Öжϼ«ÐÔ¼°¿í¶ÈÅäÖã»\r
-               hx3695_write_reg(0X34, 0x00);// ÖжÏÌØÊâÅäÖã»\r
-               hx3695_write_reg(0X36, 0x00);// phase data ready ±êÖ¾ÉèÖã»\r
+               hx3695_write_reg(0X33, 0x83);// 中断极性及宽度配置;\r
+               hx3695_write_reg(0X34, 0x00);// 中断特殊配置;\r
+               hx3695_write_reg(0X36, 0x00);// phase data ready 标志设置;\r
                hx3695_write_reg(0X38, 0x00);\r
                \r
     hx3695_write_reg(0X3a, (phase1_inner_avg | (phase2_inner_avg<<4)));  \r
@@ -2534,16 +2534,16 @@ void hx3695_factory_ft_int_test_config(void)//
 /////////FIFO and adc conversion ready config////////\r
 /////////FIFO and adc conversion ready config////////\r
 #if defined(PPG_INT_MODE)\r
-               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble\r
+               hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble\r
                 hx3695_write_reg(0X33, 0x83);   // int width                                                                                                                                           \r
      hx3695_write_reg(0X21, 0x00);   // fifo int sel,00=FIFO INT config clear\r
                 hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
 #elif defined(INT_MODE)               //FIFO_ALL_MOST_FULL)\r
-                hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble\r
+                hx3695_write_reg(0X1b, 0x92);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble\r
                 hx3695_write_reg(0X1c, (fifo_watermark&0xff));   //fifo_watermark\r
                 hx3695_write_reg(0X1d, fifo_watermark<<8);       //bit<0>=fifo_watermark[8]  \r
                 hx3695_write_reg(0X33, 0x83);   // int width   \r
@@ -2551,9 +2551,9 @@ void hx3695_factory_ft_int_test_config(void)//
      hx3695_write_reg(0X38, 0x04);   // int sel,00=close almost full int,04=enable almost full int\r
 \r
 #else\r
-                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble                                                                             \r
+                hx3695_write_reg(0X1b, 0x92);    // bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble                                                                          \r
      hx3695_write_reg(0X38, 0x01);   // int sel,00=close almost full int,04=enable almost full int\r
      \r
 #endif\r
index cc4b817..65da39f 100644 (file)
@@ -114,8 +114,8 @@ hrs_wear_msg_code_t hx3695_hrs_wear_mode_check(WORK_MODE_T mode, int32_t infrare
             hrs_wear_status = MSG_HRS_NO_WEAR;                \r
         }      \r
     }   \r
-//   SEGGER_RTT_printf(0,"hrs ir_data: %d, hrs_wear_status_pre=%d, hrs_wear_status=%d\r\n",\\r
-                          infrared_data,hrs_wear_status_pre,hrs_wear_status);\r
+//   SEGGER_RTT_printf(0,"hrs ir_data: %d, hrs_wear_status_pre=%d, hrs_wear_status=%d\r\n",\r
+                          // infrared_data,hrs_wear_status_pre,hrs_wear_status);\r
     if(mode == WEAR_MODE)\r
     {\r
         return hrs_wear_status;\r
@@ -378,7 +378,7 @@ void PPG_hrs_Calibration_Routine(HRS_CAL_SET_T *calR, int32_t g1_led,int32_t g2_
 }\r
 \r
 \r
-HRS_CAL_SET_T   PPG_hrs_agc( )\r
+HRS_CAL_SET_T   PPG_hrs_agc(void)\r
 {\r
     int32_t g1_led_val, g2_led_val, g1_amb_val, g2_amb_val;\r
     \r
@@ -933,8 +933,8 @@ uint8_t hx3695_hrs_read(hrs_sensor_data_t * s_dat)
 //                                     SEGGER_RTT_printf(0,"PPG_data:  %d , PPG_src_data2: %d\r\n", PPG_src_data,PPG_src_data2);\r
             hx3695_hrs_wear_mode_check(HRS_MODE,Ir_src_data); \r
 //           SEGGER_RTT_printf(0,"hx3690_hrs_wear_mode_check:::%d %d %d\r\n", hx3695_read_reg(0X2a),hx3695_read_reg(0X2b),hx3695_read_reg(0X2c));\r
-//                                     SEGGER_RTT_printf(0,"fifo:%d/%d %d %d, fifo_data: %d %d %d %d\r\n" ,1+i,data_count,   \\r
-            PPG_buf[i],ir_buf[i],s_buf[i*3],s_buf[i*3+1],s_buf[i*3+2],calReg_Hrs.LED);         \r
+                                       // SEGGER_RTT_printf(0,"fifo:%d/%d %d %d, fifo_data: %d %d %d %d\r\n" ,1+i,data_count,   \r
+            // PPG_buf[i],ir_buf[i],s_buf[i*3],s_buf[i*3+1],s_buf[i*3+2],calReg_Hrs.LED);         \r
         }\r
                                ps_green_data = ps_data[1];   //  -  ((ps_data[2]+ps_data[0])>>1);\r
 //                             SEGGER_RTT_printf(0,"ps_green_data: %d  PS8: %d, PS7:  %d\r\n", ps_green_data,ps_data[7],ps_data[6]);\r
index 3d77689..0a70049 100644 (file)
@@ -86,7 +86,7 @@ typedef struct {
        uint8_t Group3_max_cur;\r
 } HRS_CAL_SET_T;\r
 \r
-HRS_CAL_SET_T PPG_hrs_agc( );\r
+HRS_CAL_SET_T PPG_hrs_agc(void);\r
 void Init_hrs_PPG_Calibration_Routine(HRS_CAL_SET_T *calR); \r
 void Restart_hrs_PPG_Calibration_Routine(HRS_CAL_SET_T *calR);\r
 //void PPG_hrs_Calibration_Routine(HRS_CAL_SET_T *calR, int32_t g1_led,int32_t g2_led,int32_t g3_led, int32_t g1_amb, int32_t g2_amb,int32_t g3_amb);\r
diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_custom.c b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_custom.c
new file mode 100644 (file)
index 0000000..70d7077
--- /dev/null
@@ -0,0 +1,40 @@
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "tyhx_hrs_custom.h"
+
+
+
+// us 延时函数, 客户需填写
+void tyhx_delay_us(uint32_t us)
+{
+    
+}
+void tyhx_delay_ms(uint32_t ms)
+{
+
+}
+
+// i2c 写函数, 客户需填写, 地址0x44(7bit)
+bool tyhx_write_reg(uint8_t i2c_addr,uint8_t reg_addr, uint8_t data)
+{
+  return 1;
+}
+
+// i2c 读函数, 客户需填写
+uint8_t tyhx_read_regs(uint8_t i2c_addr,uint8_t reg_addr,uint8_t *readbuf,uint8_t readlen)
+{
+  return 0;
+}
+
+bool tyhx_timer_start(uint32_t ms)
+{
+  return 1;
+}
+bool tyhx_timer_stop(uint32_t ms)
+{
+  return 1;
+}
\ No newline at end of file
index 2147396..1bf2916 100644 (file)
@@ -433,9 +433,9 @@ void hx3695_hrv_low_power(void)
 //     hx3695_write_reg(0X21, 0x00);   // fifo int sel,00=FIFO INT config clear\r
                 hx3695_write_reg(0X38, 0x081);   // int sel,00=close almost full int,04=enable almost full int\r
 #else\r
-                hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\\r
-                                        0011=p4;0100=p5;0101=p6;0110=p7;\\r
-                                        bits<7> fifo enble     \r
+                hx3695_write_reg(0X1b, 0x90);// bits<3:0> fifo data sel, 0000 = p1;0001= p2;0010=p3;\r
+                                        // 0011=p4;0100=p5;0101=p6;0110=p7;\r
+                                        // bits<7> fifo enble  \r
      hx3695_write_reg(0X36, 0x00);                                                                                                                                                             \r
                                                                                                                                                \r
      hx3695_write_reg(0X38, 0x00);   // int sel,00=close almost full int,01= prf int  04=enable almost full int\r
index 70776a5..74b0be6 100644 (file)
@@ -1047,7 +1047,7 @@ uint8_t hx3695_spo2_read(spo2_sensor_data_t * s_dat)
     //AGC_LOG("s_ppg_state: %d,s_cal_state: %d\r\n",s_ppg_state,s_cal_state);\r
     if (!s_ppg_state || s_cal_state) \r
     {\r
-        return NULL;\r
+        return 0;\r
     }    \r
 \r
                        data_count = hx3695_read_fifo_data(s_buf,spo2_phase_num,1); \r
@@ -1082,25 +1082,25 @@ uint8_t hx3695_spo2_read(spo2_sensor_data_t * s_dat)
                                        ir_buf2[i] = Ir_src_data2;\r
                                        \r
                                        //SEGGER_RTT_printf(0,"G_LEDDAC: %d,R_LEDDAC: %d\r\n", calReg_SPO2.R_LEDDAC,cal.R_LEDDAC);\r
-                                       //DEBUG_PRINTF(0,"%d/%d %d %d %d %d %d %d %d %d\r\n" ,1+i,data_count,\\r
-                                       green_buf[i],red_buf[i],ir_buf[i],s_buf[i*4],s_buf[i*4+1],s_buf[i*4+2],s_buf[i*4+3],spo2_wear_status);\r
+                                       //DEBUG_PRINTF(0,"%d/%d %d %d %d %d %d %d %d %d\r\n" ,1+i,data_count,\r
+                                       // green_buf[i],red_buf[i],ir_buf[i],s_buf[i*4],s_buf[i*4+1],s_buf[i*4+2],s_buf[i*4+3],spo2_wear_status);\r
 \r
-//                                     SEGGER_RTT_printf(0,"fifo_data: %d/%d %d %d %d %d\r\n", i+1,data_count,s_buf[i*4],\\r
-//                     s_buf[i*4+1],s_buf[i*4+2],s_buf[i*4+3]);\r
+//                                     SEGGER_RTT_printf(0,"fifo_data: %d/%d %d %d %d %d\r\n", i+1,data_count,s_buf[i*4],\r
+                       // s_buf[i*4+1],s_buf[i*4+2],s_buf[i*4+3]);\r
 \r
                                        \r
                                        if(spo2_wear_status==MSG_SPO2_WEAR)\r
                                        {\r
                                                        if(hx3695_spo2_check_unwear(Ir_wear_value))    //Ir_src_data2\r
                                                        {\r
-                                                               return NULL;\r
+                                                               return 0;\r
                                                        }\r
                                        }\r
                                        else\r
                                        {\r
                                                        if(hx3695_spo2_check_wear(Ir_wear_value))\r
                                                        {\r
-                                                               return NULL;\r
+                                                               return 0;\r
                                                        }\r
                                        }\r
                        }\r
diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/libhx3695.a b/code/sdk/drivers/peripheral/ppg/hx3695/libhx3695.a
new file mode 100644 (file)
index 0000000..4ef4b51
Binary files /dev/null and b/code/sdk/drivers/peripheral/ppg/hx3695/libhx3695.a differ
index a293181..b693581 100644 (file)
@@ -3,7 +3,7 @@
 #define _TYHX_HRS_ALG_H_\r
 \r
 #include <stdint.h>\r
-\r
+#if 0\r
 /* portable 8-bit unsigned integer */\r
 typedef unsigned char           uint8_t;\r
 /* portable 8-bit signed integer */\r
@@ -16,7 +16,7 @@ typedef signed short int        int16_t;
 typedef unsigned int            uint32_t;\r
 /* portable 32-bit signed integer */\r
 typedef signed int              int32_t;\r
-\r
+#endif\r
 #ifndef bool\r
 #define bool unsigned char\r
 #endif\r
diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h b/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h
new file mode 100644 (file)
index 0000000..133cd25
--- /dev/null
@@ -0,0 +1,63 @@
+#ifndef __TYHX_HRS_CUSTOM_H__
+#define __TYHX_HRS_CUSTOM_H__
+
+#include "debug_print.h"
+typedef struct { 
+    int32_t leak_green;
+    int32_t leak_red;
+    int32_t leak_ir;
+    int32_t card_green;
+    int32_t card_red;
+    int32_t card_ir;
+    int32_t hr_living;
+    int32_t hr_living_qu;
+    int32_t hr_living_std;
+    int32_t lastesthrs;
+    int32_t lastestspo2;
+    int32_t lastesthrv;
+    int32_t wearstatus;
+} FT_CUSTOM_RESULTS_t;
+
+extern FT_CUSTOM_RESULTS_t hrsresult;
+#define TYHX_DEBUG
+
+#ifdef TYHX_DEBUG
+#define TYHX_LOG(fmt, ...)                    \
+    do {                                      \
+        PRINT(fmt"\r\n", ##__VA_ARGS__);     \
+    } while (0)
+#else
+#define TYHX_LOG(ftm, ...)
+#endif
+
+
+#define CHIP_HX3695
+#define HRS_ALG_LIB
+#define SPO2_ALG_LIB
+#define HRV_ALG_LIB
+#define CHECK_TOUCH_LIB
+// #define HRS_BLE_APP   
+// #define INT_MODE   
+
+#define I2C_DEV_8ADDR 0X44
+
+// us 延时函数, 客户需填写
+void tyhx_delay_us(uint32_t us);
+void tyhx_delay_ms(uint32_t ms);
+
+// i2c 写函数, 客户需填写, 地址0x44(7bit)
+bool tyhx_write_reg(uint8_t i2c_addr,uint8_t reg_addr, uint8_t data);
+
+// i2c 读函数, 客户需填写
+uint8_t tyhx_read_regs(uint8_t i2c_addr,uint8_t reg_addr,uint8_t *readbuf,uint8_t readlen);
+
+typedef enum{
+    TYHX_TIMER_40MS,
+    TYHX_TIMER_320MS,
+} TYHX_TIMER_TYPE;
+
+bool tyhx_timer_start(uint32_t ms);
+bool tyhx_timer_stop(uint32_t ms);
+
+
+#endif //__TYHX_HRS_CUSTOM_H__
\ No newline at end of file
index 4d5cd36..116e278 100644 (file)
@@ -3,7 +3,7 @@
 #endif\r
        \r
 #include <stdint.h>\r
-\r
+#if 0\r
 /* portable 8-bit unsigned integer */\r
 typedef unsigned char           uint8_t;\r
 /* portable 8-bit signed integer */\r
@@ -16,7 +16,7 @@ typedef signed short int        int16_t;
 typedef unsigned int            uint32_t;\r
 /* portable 32-bit signed integer */\r
 typedef signed int              int32_t;\r
-\r
+#endif\r
 #ifndef  bool\r
 #define  bool unsigned char\r
 #endif\r
index c6a83ee..e330cc6 100644 (file)
@@ -7,7 +7,7 @@
 \r
 //#include "tyhx_spo2_alg_para.h"\r
 \r
-\r
+#if 0\r
 /* portable 8-bit unsigned integer */\r
 typedef unsigned char           uint8_t;\r
 /* portable 8-bit signed integer */\r
@@ -20,6 +20,7 @@ typedef signed short int        int16_t;
 typedef unsigned int            uint32_t;\r
 /* portable 32-bit signed integer */\r
 typedef signed int              int32_t;\r
+#endif\r
 \r
 #ifndef bool\r
 #define bool unsigned char\r