Merge #3207 into fd272 from refs/changes/3207/head

Code review from 袁清梦

* refs/changes/3207/head: (3 commits squashed)

  - 睡眠时间更新 删除小睡的更新

  - Merge branch 'fd272' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into fd272

  - 回退心率的修改

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3207

diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
index a1cdf2a..bbffc58 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
+++ b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
@@ -545,49 +545,36 @@ bool hx3695_check_wear(ppg_sensor_data_t *ppg_sensor_dat,uint8_t count)
 \r
         if(wear_status_pre != wear_status)\r
         {\r
+            if(uapi_dev_runtime_get_train_status() && !wear_status)\r
+                avg_hrs = 0;\r
 \r
             wear_status_pre = wear_status;\r
 \r
-\r
-            if(uapi_dev_runtime_get_train_status())\r
+            if(uapi_dev_runtime_get_sleep_monitoring_status())\r
             {\r
-                #ifdef SUPPORT_CYWEE_SERVICE\r
-                cywee_wear_status_update(&wear_status);\r
-                #endif\r
                 if(!wear_status)\r
                 {\r
-                    avg_hrs = 0;\r
+                    #ifdef SUPPORT_CYWEE_SERVICE\r
+                    cywee_wear_status_update(&wear_status);\r
+                    #endif\r
                 }\r
-            }\r
-            else {\r
-            \r
-                if(uapi_dev_runtime_get_sleep_monitoring_status())\r
+                else if(living_status == 1 && wear_status)\r
                 {\r
-                    if(!wear_status)\r
-                    {\r
-                        #ifdef SUPPORT_CYWEE_SERVICE\r
-                        cywee_wear_status_update(&wear_status);\r
-                        #endif\r
-                    }\r
-                    else if(living_status == 1 && wear_status)\r
-                    {\r
-                        #ifdef SUPPORT_CYWEE_SERVICE\r
-                        cywee_wear_status_update(&wear_status);\r
-                        #endif\r
-                    }\r
+                    #ifdef SUPPORT_CYWEE_SERVICE\r
+                    cywee_wear_status_update(&wear_status);\r
+                    #endif\r
                 }\r
-                else\r
+            }\r
+            else\r
+            {\r
+                if(living_status != 2)\r
                 {\r
-                    if(living_status != 2)\r
-                    {\r
 \r
-        #ifdef SUPPORT_CYWEE_SERVICE\r
-                        cywee_wear_status_update(&wear_status);\r
-        #endif\r
-                    }\r
+    #ifdef SUPPORT_CYWEE_SERVICE\r
+                    cywee_wear_status_update(&wear_status);\r
+    #endif\r
                 }\r
             }\r
-            \r
 \r
 \r
             // printf("wear_status:%d\n",wear_status);\r
@@ -1696,11 +1683,11 @@ void wear_mode_timeout_handler(void * p_context)
 {\r
     // printf("wear_mode_timeout_handler \n");\r
     if(work_mode_flag == WEAR_MODE)\r
-    {\r
-        #ifdef CHECK_TOUCH_LIB\r
+    {  \r
+        #ifdef CHECK_TOUCH_LIB \r
           hx3695_ppg_Int_handle(&ppg_sensor_data);\r
         #endif\r
-    }\r
+    } \r
 }\r
 \r
 void hx3695_spo2_disable(void)\r

diff --git a/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp b/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp
index cf3beb6..07c93b3 100644 (file)
--- a/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp
+++ b/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp
@@ -229,7 +229,7 @@ errcode_t uapi_ppg_service_init(void)
     taskcfg.create_queue_handle = create_ppg_queue;
     taskcfg.attr.name="ppg_service";
 
-    taskcfg.attr.priority = osPriorityAboveNormal2;
+    taskcfg.attr.priority = osPriorityAboveNormal3;
 
     taskcfg.attr.stack_size = PPG_SERVICE_TASK_SIZE;
     taskcfg.func = ppg_service_check_task;