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
7a2a5d3c
Commit
7a2a5d3c
authored
4 years ago
by
schneider
Browse files
Options
Downloads
Patches
Plain Diff
fix(max86150): Fix a few register accesses related to averaging
parent
a0389189
No related branches found
No related tags found
1 merge request
!414
SpO2 sensor improvements
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/vendor/Maxim/MAX86150/max86150.c
+4
-5
4 additions, 5 deletions
lib/vendor/Maxim/MAX86150/max86150.c
with
4 additions
and
5 deletions
lib/vendor/Maxim/MAX86150/max86150.c
+
4
−
5
View file @
7a2a5d3c
...
...
@@ -35,7 +35,7 @@ static const uint8_t MAX86150_FIFOCONTROL2 = 0x0A;
static
const
uint8_t
MAX86150_SYSCONTROL
=
0x0D
;
static
const
uint8_t
MAX86150_PPGCONFIG1
=
0x0E
;
static
const
uint8_t
MAX86150_PPGCONFIG2
=
0x0F
;
static
const
uint8_t
MAX86150_
LED_PROX_AMP
=
0x10
;
static
const
uint8_t
MAX86150_
PROXINTTHRESH
=
0x10
;
static
const
uint8_t
MAX86150_LED1_PULSEAMP
=
0x11
;
static
const
uint8_t
MAX86150_LED2_PULSEAMP
=
0x12
;
...
...
@@ -44,7 +44,6 @@ static const uint8_t MAX86150_LED_PILOT_PA = 0x15;
static
const
uint8_t
MAX86150_ECG_CONFIG1
=
0x3C
;
static
const
uint8_t
MAX86150_ECG_CONFIG3
=
0x3E
;
static
const
uint8_t
MAX86150_PROXINTTHRESH
=
0x10
;
static
const
uint8_t
MAX86150_PARTID
=
0xFF
;
...
...
@@ -65,7 +64,7 @@ static const uint8_t MAX86150_INT_PROX_INT_MASK = (byte)~0b00010000;
static
const
uint8_t
MAX86150_INT_PROX_INT_ENABLE
=
0x10
;
static
const
uint8_t
MAX86150_INT_PROX_INT_DISABLE
=
0x00
;
static
const
uint8_t
MAX86150_S
A
MP
LE
AV
G
_MASK
=
(
byte
)
~
0
b00000111
;
static
const
uint8_t
MAX86150_SMP
_
AV
E
_MASK
=
(
byte
)
~
0
b00000111
;
static
const
uint8_t
MAX86150_ROLLOVER_MASK
=
(
byte
)
~
0
b00010000
;
static
const
uint8_t
MAX86150_ROLLOVER_ENABLE
=
0
b00010000
;
...
...
@@ -337,7 +336,7 @@ void max86150_set_led_ir_amplitude(uint8_t amplitude)
void
max86150_set_led_proximity_amplitude
(
uint8_t
amplitude
)
{
max86150_write_register
(
MAX86150_ADDRESS
,
MAX86150_LED_P
ROX_AMP
,
amplitude
MAX86150_ADDRESS
,
MAX86150_LED_P
ILOT_PA
,
amplitude
);
}
...
...
@@ -400,7 +399,7 @@ void max86150_disableSlots(void)
void
max86150_set_ppg_averaging
(
uint8_t
numberOfSamples
)
{
max86150_bit_mask
(
MAX86150_
FIFO
CONFIG
,
MAX86150_S
A
MP
LE
AV
G
_MASK
,
numberOfSamples
MAX86150_
PPG
CONFIG
2
,
MAX86150_SMP
_
AV
E
_MASK
,
numberOfSamples
);
}
...
...
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