summaryrefslogtreecommitdiff
path: root/src/components/heartrate/Ppg.cpp
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-07-14 06:59:56 (GMT)
committerRiku Isokoski <riksu9000@gmail.com>2021-07-14 06:59:56 (GMT)
commit95b8a56dd42da067b56e37111577427518d825fb (patch)
tree2a5d20d061f27e510bd7bd4e1af1621ad8a6d4b0 /src/components/heartrate/Ppg.cpp
parent239b5547eae64d05f5d7544f0e11bfb877a75a02 (diff)
parenta07b6382aef3c30d8ea8f28fcc3cc880d7afd747 (diff)
Merge branch 'develop' into fix_touchevent_tap
Diffstat (limited to 'src/components/heartrate/Ppg.cpp')
-rw-r--r--src/components/heartrate/Ppg.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/components/heartrate/Ppg.cpp b/src/components/heartrate/Ppg.cpp
index da0789e..fcba381 100644
--- a/src/components/heartrate/Ppg.cpp
+++ b/src/components/heartrate/Ppg.cpp
@@ -38,9 +38,8 @@ namespace {
}
}
-Ppg::Ppg(float spl)
- : offset {spl},
- hpf {0.87033078, -1.74066156, 0.87033078, -1.72377617, 0.75754694},
+Ppg::Ppg()
+ : hpf {0.87033078, -1.74066156, 0.87033078, -1.72377617, 0.75754694},
agc {20, 0.971, 2},
lpf {0.11595249, 0.23190498, 0.11595249, -0.72168143, 0.18549138} {
}
@@ -67,13 +66,7 @@ float Ppg::HeartRate() {
dataIndex = 0;
return hr;
}
-
-int cccount = 0;
float Ppg::ProcessHeartRate() {
-
- if (cccount > 2)
- asm("nop");
- cccount++;
auto t0 = Trough(data.data(), dataIndex, 7, 48);
if (t0 < 0)
return 0;