Merge #893 into sdk602patch0626 from refs/changes/893/head
author彭磊 <1624952103@qq.com>
Fri, 6 Sep 2024 08:53:28 +0000 (08:53 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 6 Sep 2024 08:53:28 +0000 (08:53 +0000)
commit54609dabfdad75b39a5df2ee5fa2ffa213f689a4
treeb4de4331410acc512c4e863dd259f81d520b084f
parent25002248b91a357bdb5489c577780019b26cd68f
Merge #893 into sdk602patch0626 from refs/changes/893/head

Code review from 彭磊

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

  - 修复睡眠数据存储bug

  - 优化睡眠模式参数初始化过程
    修复运动模式卡路里不增加的BUG

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

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/893
code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/include/AlarmClockTimerConfig.h
code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h
code/sdk/drivers/peripheral/cywee/service/cywee_service.c
code/sdk/drivers/peripheral/cywee/src/main_dml.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hal.c
code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp
code/sdk/drivers/peripheral/utils/custom_utils.c
code/sdk/drivers/peripheral/utils/custom_utils.h