From cf8b13a262ca7384f7053add61b112d6e58e6337 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com> Date: Wed, 6 Nov 2024 09:26:39 +0000 Subject: [PATCH] Merge #1354 into sdk602patch0911 from refs/changes/1354/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 彭磊 * refs/changes/1354/head: (4 commits squashed) - 更新cywee算法库 修复睡眠时间戳异常bug - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 睡眠时间戳同步算法库更新优化 - Merge branch 'sdk602patch0911' 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 Reviewed-by: aliyun6865282430 <1624952103@qq.com> Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1354 --- code/sdk/drivers/peripheral/cywee/src/main_dml.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(×tamp); - sleep_stat[stat_num].timestamp = timestamp; + // uapi_get_timestampe_ss(×tamp); + // sleep_stat[stat_num].timestamp = timestamp; wake_up_timestamp = sleep_stat[stat_num].timestamp; sleep_update_timestamp = wake_up_timestamp; } -- 2.17.1