projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4b73cb
)
Merge #3014 into fd272 from refs/changes/3014/head
3021/target/1
3022/target/1
author
彭磊
<1624952103@qq.com>
Tue, 6 Jan 2026 06:26:26 +0000
(06:26 +0000)
committer
袁清梦
<3449750381@qq.com>
Tue, 6 Jan 2026 06:26:26 +0000
(06:26 +0000)
Code review from 彭磊
* refs/changes/3014/head: (2 commits squashed)
- 272运动不启动活体检测
- Merge branch 'fd272' 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/3014
code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
patch
|
blob
|
history
diff --git
a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
index
11ae050
..
015f0a9
100644
(file)
--- a/
code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
+++ b/
code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c
@@
-1151,7
+1151,10
@@
bool hx3695_init(WORK_MODE_T mode)
switch (work_mode_flag)
\r
{
\r
case HRS_MODE:
\r
+ if(!uapi_dev_runtime_get_train_status())
\r
+ {
\r
tyhx_hrs_set_living(1, 15, 30);
\r
+ }
\r
hx3695_hrs_enable(&ppg_sensor_data);
\r
break;
\r
\r