From 51bff2a4ea93147ab172845f5d902f20212e9893 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BD=AD=E7=A3=8A?= <1624952103@qq.com> Date: Tue, 3 Sep 2024 11:47:51 +0000 Subject: [PATCH] Merge #865 into sdk602patch0626 from refs/changes/865/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 彭磊 * refs/changes/865/head: (2 commits squashed) - 修复BUG #551 "运动，放桌子上不动，卡路里会增加" - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 Signed-off-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/865 --- code/sdk/drivers/peripheral/cywee/src/main_dml.c | 10 ++++++++-- 1 file changed, 8 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 17200cb85..a53dd5cf3 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -528,7 +528,10 @@ void cywee_inactivity_mode_change(int mode) //设置睡眠 memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; - scl.iData[2] = 0; // 0.不使用心率 1.使用心率 (暂时关闭,不使用心率数据输入算法) + scl.iData[3] = 4; + scl.iData[4] = 4; + scl.iData[6] = 4; + scl.iData[7] = 1; CWM_SettingControl(SCL_SLEEP_CONFIG, &scl); memset(&scl, 0, sizeof(scl)); @@ -1205,7 +1208,10 @@ int cywee_main_dml(void) //设置运动模式 memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; - CWM_SettingControl(SCL_ACTIVITY_CONFIG, &scl); + scl.iData[4] = 2; + scl.iData[7] = 2; + scl.iData[10] = 5; + CWM_SettingControl(SCL_ACTIVITY_CONFIG, &scl); //设置久坐 -- 2.17.1