心率增加0数据传递，报0显示“--“

diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
index ef80e51..67484b9 100644 (file)
--- a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
+++ b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
@@ -2708,16 +2708,7 @@ static void get_avg_hrs(int32_t hrs)
         }\r
         avg_hrs = (sum_hrs - max_hrs - min_hrs) / (hrs_num - 2);\r
         //PRINT("max_hrs[%d],min_hrs[%d],avg_hrs[%d]\n",max_hrs,min_hrs,avg_hrs);\r
-        hx3695_msg_callback_t func =  hx3695_get_send_msg_callback_func();\r
-        if(func != NULL)\r
-        {\r
-          hrsresult.lastesthrs = avg_hrs;\r
-          func(HX3695_MSG_TYPE_HRS_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
-          if(uapi_get_cywee_static_state())\r
-          {\r
-              func(HX3695_MSG_TYPE_STATIC_HRS_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
-          }\r
-        }\r
+        hrsresult.lastesthrs = avg_hrs;\r
         if(hrs_mode_state)\r
         {\r
             cywee_data = hrsresult.lastesthrs;\r
@@ -2894,20 +2885,28 @@ void hx3695_hrs_ppg_Int_handle(void)
 \r
     if(hrs_wear_status == MSG_HRS_WEAR && hrsresult.hr_living == MSG_LIVING_TRUE)\r
     {\r
-        if(hrsresult.lastesthrs > 50)\r
+        if(hrsresult.lastesthrs > 60 || hrsresult.lastesthrs == 0)\r
                      get_avg_hrs(hrsresult.lastesthrs);\r
         hrsresult.wearstatus = MSG_HRS_WEAR;\r
     }\r
     else\r
     {\r
         hrsresult.wearstatus = MSG_HRS_NO_WEAR;\r
+        hrsresult.lastesthrs = 0;\r
     }\r
     hx3695_msg_callback_t func =  hx3695_get_send_msg_callback_func();\r
     if(func != NULL)\r
     {\r
-        func(HX3695_MSG_TYPE_WEARSTAT_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
+      PRINT("hrsresult.lastesthrs : %d \n",hrsresult.lastesthrs);\r
+      func(HX3695_MSG_TYPE_HRS_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
+      if(uapi_get_cywee_static_state())\r
+      {\r
+          func(HX3695_MSG_TYPE_STATIC_HRS_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
+      }\r
+      func(HX3695_MSG_TYPE_WEARSTAT_UPDATE,&hrsresult,sizeof(FT_CUSTOM_RESULTS_t));\r
     }\r
 \r
+\r
     //PRINT("hx3695 data_cnt: %d,  hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n",\r
                //alg_results.data_cnt,  hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs);\r
 \r