Merge #1328 into sdk602patch0911 from refs/changes/1328/head
author彭磊 <1624952103@qq.com>
Sun, 3 Nov 2024 08:15:26 +0000 (08:15 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sun, 3 Nov 2024 08:15:26 +0000 (08:15 +0000)
commit0fdb6fc5af3ca7289d9c1b19f1a3201a9ca495bc
tree2493524c3d9f4705841d60b1b7c7d87db98afcd5
parent49fc3947d7ddd1072c222df148e227dabe889cfb
Merge #1328 into sdk602patch0911 from refs/changes/1328/head

Code review from 彭磊

* refs/changes/1328/head: (5 commits squashed)

  - 恢复出厂设置添加死机文件路径

  - 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

  - 优化电量获取,平滑增加或减少电量
    增加睡眠时间段心率检测无效数

  - 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: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1328
code/sdk/application/battery/service/battery_driver.cpp
code/sdk/application/battery/service/battery_service.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp