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

Code review from 彭磊

* refs/changes/3090/head: (8 commits squashed)

  - 回退睡眠修改

  - 修复老化死机

  - 优化老化死机，优化表冠初始化

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

  - 优化老化死机，优化表冠初始化(补)

  - 测功耗指令关闭充电功能

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

  - 优化心率计算

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

diff --git a/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp b/code/sdk/zhihui/drivers/ppg/service/ppg_service.cpp
index 83aa5ac..d87261d 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 = osPriorityBelowNormal4;
+    taskcfg.attr.priority = osPriorityAboveNormal3;
 
     taskcfg.attr.stack_size = PPG_SERVICE_TASK_SIZE;
     taskcfg.func = ppg_service_check_task;

diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c
index b2fe8f0..ceeb305 100644 (file)
--- a/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c
@@ -2673,7 +2673,7 @@ errcode_t custom_i2c_init(uint8_t bus_index)
     result = uapi_i2c_master_init(bus_index, 400000, I2C_SPEED_MODE_FS); /* 400000: 400KHz */
 
     if(result == ERRCODE_I2C_ALREADY_INIT){
-        PRINT("cywee i2c already init ret=0x%x\n", result);
+        // PRINT("cywee i2c already init ret=0x%x\n", result);
         return ERRCODE_SUCC;
     }
     else if (result != ERRCODE_SUCC && result != ERRCODE_I2C_ALREADY_INIT) {