Merge #3082 into fd272 from refs/changes/3082/head 3090/target/1 3091/target/1
author彭磊 <1624952103@qq.com>
Wed, 14 Jan 2026 11:56:15 +0000 (11:56 +0000)
committer袁清梦 <3449750381@qq.com>
Wed, 14 Jan 2026 11:56:15 +0000 (11:56 +0000)
commit106a22f94064c2fcc50aacb9f5b2b2150f845d43
treec816f9ebb1309048a69fff007803b0b498009677
parent25dc62ce0fcf45f440d3661bc06558f891cfb190
Merge #3082 into fd272 from refs/changes/3082/head

回退睡眠修改

* refs/changes/3082/head: (6 commits squashed)

  - 回退睡眠修改

  - 修复老化死机

  - 优化老化死机,优化表冠初始化

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

  - 优化老化死机,优化表冠初始化(补)

  - 测功耗指令关闭充电功能

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3082
code/sdk/zhihui/UI/producttest/src/testView.cpp
code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c
code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
code/sdk/zhihui/drivers/rotary_encoder/hx3508/hx3508.c
code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_def.h
code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.c
code/sdk/zhihui/drivers/rotary_encoder/rotary_encoder_drv.h
code/sdk/zhihui/drivers/vibrator/service/vibrator_service.cpp
code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c