Skip to content

fixed mean diff and enhanced moving average #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aedalzotto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed mean diff and enhanced moving average #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 29 additions & 19 deletions MAX30100.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ MAX30100::MAX30100(
lpbFilterIR.v[1] = 0;
lpbFilterIR.result = 0;

memset(meanDiffIR.values, 0, sizeof(float)*MEAN_FILTER_SIZE);
meanDiffIR.index = 0;
meanDiffIR.sum = 0;
meanDiffIR.count = 0;


valuesBPM[0] = 0;
// Erase all valuesBPM
memset(valuesBPM, 0, sizeof(float)*PULSE_BPM_SAMPLE_SIZE);
valuesBPMSum = 0;
valuesBPMCount = 0;
bpmIndex = 0;
Expand Down Expand Up @@ -203,23 +204,38 @@ bool MAX30100::detectPulse(float sensor_value)
if(debug == true)
Serial.println(rawBPM);

//This method sometimes glitches, it's better to go through whole moving average everytime
//IT's a neat idea to optimize the amount of work for moving avg. but while placing, removing finger it can screw up
//valuesBPMSum -= valuesBPM[bpmIndex];
//valuesBPM[bpmIndex] = rawBPM;
//valuesBPMSum += valuesBPM[bpmIndex];
currentPulseDetectorState = PULSE_TRACE_DOWN;

valuesBPM[bpmIndex] = rawBPM;
valuesBPMSum = 0;
for(int i=0; i<PULSE_BPM_SAMPLE_SIZE; i++)
{
valuesBPMSum += valuesBPM[i];
// Reset moving avg after a while without pulses
if(beatDuration > PULSE_BEAT_DURATION_RST){
memset(valuesBPM, 0, sizeof(float)*PULSE_BPM_SAMPLE_SIZE);
valuesBPMSum = 0;
bpmIndex = 0;
valuesBPMCount = 0;

if(debug)
Serial.println("Moving avg. reseted");
}

// Eliminate glitchy values
if(rawBPM > PULSE_MAX_VALUE || rawBPM < PULSE_MIN_VALUE){
if(debug)
Serial.println("BPM out of bounds. Not adding to moving avg.");

return false;
}

valuesBPMSum -= valuesBPM[bpmIndex];
valuesBPM[bpmIndex] = rawBPM;
valuesBPMSum += valuesBPM[bpmIndex];

if(valuesBPMCount < PULSE_BPM_SAMPLE_SIZE)
valuesBPMCount++;

if(debug == true)
{
Serial.print("CurrentMoving Avg: ");
for(int i=0; i<PULSE_BPM_SAMPLE_SIZE; i++)
for(int i=0; i<valuesBPMCount; i++)
{
Serial.print(valuesBPM[i]);
Serial.print(" ");
Expand All @@ -231,19 +247,13 @@ bool MAX30100::detectPulse(float sensor_value)
bpmIndex++;
bpmIndex = bpmIndex % PULSE_BPM_SAMPLE_SIZE;

if(valuesBPMCount < PULSE_BPM_SAMPLE_SIZE)
valuesBPMCount++;

currentBPM = valuesBPMSum / valuesBPMCount;
if(debug == true)
{
Serial.print("AVg. BPM: ");
Serial.println(currentBPM);
}


currentPulseDetectorState = PULSE_TRACE_DOWN;

return true;
}
break;
Expand Down
4 changes: 3 additions & 1 deletion MAX30100.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ SOFTWARE.
#define PULSE_GO_DOWN_THRESHOLD 1

#define PULSE_BPM_SAMPLE_SIZE 10 //Moving average size

#define PULSE_BEAT_DURATION_RST 2500 // Time in ms to reset the moving avg
#define PULSE_MAX_VALUE 220
#define PULSE_MIN_VALUE 50



Expand Down