Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
card10
firmware
Commits
e10ec92e
Commit
e10ec92e
authored
5 years ago
by
schneider
Browse files
Options
Downloads
Patches
Plain Diff
fix(max86150): Disable ECG for the moment to keep PPG at 100 sps
parent
822d07ae
No related branches found
No related tags found
No related merge requests found
Pipeline
#4757
failed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/vendor/Maxim/MAX86150/max86150.c
+8
-3
8 additions, 3 deletions
lib/vendor/Maxim/MAX86150/max86150.c
with
8 additions
and
3 deletions
lib/vendor/Maxim/MAX86150/max86150.c
+
8
−
3
View file @
e10ec92e
...
...
@@ -535,7 +535,11 @@ void max86150_setup(const uint8_t ppg_sample_rate)
max86150_fifo_enable_slot
(
1
,
MAX86150_SLOT_RED_LED
);
max86150_fifo_enable_slot
(
2
,
MAX86150_SLOT_IR_LED
);
max86150_fifo_enable_slot
(
3
,
MAX86150_SLOT_ECG
);
// ECG is disabled for now as the FIFO code does not
// manage the increased FIFO rate correctly.
// E.g. instead of providging PPG data at 100 sps, the
// code provides PPG data at 200 sps
//max86150_fifo_enable_slot(3, MAX86150_SLOT_ECG);
//max86150_fifo_enable_slot(4, MAX86150_SLOT_NONE);
max86150_set_ppg_adc_range
(
MAX86150_ADCRANGE_16384
);
...
...
@@ -662,14 +666,15 @@ uint8_t max86150_get_sample(uint32_t *red, uint32_t *ir, int32_t *ecg)
MXC_I2C1_BUS0
,
MAX86150_ADDRESS
<<
1
,
data
,
3
*
3
,
3
*
2
,
0
);
// According to datasheet MS bits of PPG have to be masked
*
red
=
((
data
[
0
]
<<
16
)
|
(
data
[
1
]
<<
8
)
|
(
data
[
2
]))
&
0x7FFFF
;
*
ir
=
((
data
[
3
]
<<
16
)
|
(
data
[
4
]
<<
8
)
|
(
data
[
5
]))
&
0x7FFFF
;
*
ecg
=
(
data
[
6
]
<<
16
)
|
(
data
[
7
]
<<
8
)
|
(
data
[
8
]);
//*ecg = (data[6] << 16) | (data[7] << 8) | (data[8]);
*
ecg
=
0
;
}
}
//End readPtr != writePtr
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment