From: 彭磊 <1624952103@qq.com>
Date: Wed, 6 Nov 2024 09:26:39 +0000 (+0000)
Subject: Merge #1354 into sdk602patch0911 from refs/changes/1354/head
X-Git-Tag: fd230_release_V1.3.102~117^2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=cf8b13a262ca7384f7053add61b112d6e58e6337;p=mirrors%2FFD230.git

Merge #1354 into sdk602patch0911 from refs/changes/1354/head

Code review from 彭磊

* refs/changes/1354/head: (4 commits squashed)

  - 更新cywee算法库 修复睡眠时间戳异常bug

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 睡眠时间戳同步算法库更新优化

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1354
---

diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
index 4f65f7060..c37b88d72 100644
--- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c
+++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c
@@ -366,8 +366,8 @@ void cywee_set_sleep_stat_data(cywee_inactivity_result_t c_inactivity_result_t)
         else if(sleep_stat[stat_num].stat == 4)
         {
             //目前cywee出睡时间戳有bug 暂时先用系统时间戳
-            uapi_get_timestampe_ss(&timestamp);
-            sleep_stat[stat_num].timestamp = timestamp;
+            // uapi_get_timestampe_ss(&timestamp);
+            // sleep_stat[stat_num].timestamp = timestamp;
             wake_up_timestamp = sleep_stat[stat_num].timestamp;
             sleep_update_timestamp = wake_up_timestamp;
         }