修复表冠偶然无功能，开启心率log

diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
index c241bd5..bcb5df8 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
+++ b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
@@ -379,6 +379,9 @@ uint16_t hx3695_read_fifo_data(ppg_sensor_data_t *ppg_sensor_dat)
        uapi_get_timestampe_ms(&now_system_time);\r
        exp_group = (now_system_time - last_system_time) / (1000 / ppg_sensor_dat->fs);\r
        \r
+    printf("exp_group:%d, now_system_time:%d, exp_group:%d, fifo_data_length:%d\n",exp_group,now_system_time,exp_group,fifo_data_length);\r
+\r
+\r
        for(uint8_t index = 0; index < 3; index++)\r
        {\r
                if(fifo_data_length > (exp_group + 4) * ppg_sensor_dat->led_activated)\r
@@ -421,6 +424,8 @@ uint16_t hx3695_read_fifo_data(ppg_sensor_data_t *ppg_sensor_dat)
 \r
        hx3695_get_led_para(ppg_sensor_dat);\r
 \r
+    printf("fifo_out_count:%d\n",fifo_out_count);\r
+\r
     return fifo_out_count;\r
 }\r
 \r
@@ -1588,7 +1593,7 @@ void hx3695_ppg_Int_handle(ppg_sensor_data_t *ppg_sensor_dat)
 \r
        for(ii=0;ii<count;ii++)\r
        {\r
-               DEBUG_PRINTF("%d/%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\r\n", ii+1, count, ppg_sensor_dat->led_data[0].data_val[ii], ppg_sensor_dat->led_data[1].data_val[ii],ppg_sensor_dat->led_data[2].data_val[ii], ppg_sensor_dat->led_data[3].data_val[ii],  \\r
+               printf("%d/%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d\r\n", ii+1, count, ppg_sensor_dat->led_data[0].data_val[ii], ppg_sensor_dat->led_data[1].data_val[ii],ppg_sensor_dat->led_data[2].data_val[ii], ppg_sensor_dat->led_data[3].data_val[ii],  \\r
                ppg_sensor_dat->led_data[0].led_current, ppg_sensor_dat->led_data[0].offset_idac, ppg_sensor_dat->led_data[1].led_current, ppg_sensor_dat->led_data[1].offset_idac,ppg_sensor_dat->led_data[2].led_current, ppg_sensor_dat->led_data[2].offset_idac);\r
        }\r
 }\r

diff --git a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
index e8b5f6a..0791bd9 100644 (file)
--- a/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
+++ b/code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
@@ -1012,14 +1012,14 @@ void hx3508_int_callback(pin_t pin, uintptr_t param)
 {
     // printf("hx3508_int_callback %d 0x%X\n",pin,param);
     uapi_gpio_clear_interrupt(pin);
-    uapi_pin_set_ie(INT_PIN,HAL_PIO_IE_DISABLE);
     do_custom_cmd_service_check_msg(CUSTOM_CMD_MSG_ROTARY_OPEN,NULL,0);
 }
 
 void hx3508_open(void)
 {
-    ots_init();
-    ots_start();           // 启动定时器
+    uapi_pin_set_ie(INT_PIN,HAL_PIO_IE_DISABLE);
+    // ots_init();
+    // ots_start();           // 启动定时器
     ots_timer_start();
 }