summaryrefslogtreecommitdiff
path: root/src/components/heartrate
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/heartrate')
-rw-r--r--src/components/heartrate/Biquad.cpp3
-rw-r--r--src/components/heartrate/Biquad.h2
-rw-r--r--src/components/heartrate/HeartRateController.cpp15
-rw-r--r--src/components/heartrate/HeartRateController.h12
-rw-r--r--src/components/heartrate/Ppg.cpp50
-rw-r--r--src/components/heartrate/Ppg.h7
-rw-r--r--src/components/heartrate/Ptagc.cpp7
-rw-r--r--src/components/heartrate/Ptagc.h1
8 files changed, 47 insertions, 50 deletions
diff --git a/src/components/heartrate/Biquad.cpp b/src/components/heartrate/Biquad.cpp
index 6a4b8181..0341eda6 100644
--- a/src/components/heartrate/Biquad.cpp
+++ b/src/components/heartrate/Biquad.cpp
@@ -9,8 +9,7 @@
using namespace Pinetime::Controllers;
/** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
-Biquad::Biquad(float b0, float b1, float b2, float a1, float a2) : b0{b0}, b1{b1}, b2{b2}, a1{a1}, a2{a2} {
-
+Biquad::Biquad(float b0, float b1, float b2, float a1, float a2) : b0 {b0}, b1 {b1}, b2 {b2}, a1 {a1}, a2 {a2} {
}
float Biquad::Step(float x) {
diff --git a/src/components/heartrate/Biquad.h b/src/components/heartrate/Biquad.h
index dc9b97f6..7c8ca58f 100644
--- a/src/components/heartrate/Biquad.h
+++ b/src/components/heartrate/Biquad.h
@@ -5,7 +5,7 @@ namespace Pinetime {
/// Direct Form II Biquad Filter
class Biquad {
public:
- Biquad(float b0, float b1, float b2, float a1, float a2);
+ Biquad(float b0, float b1, float b2, float a1, float a2);
float Step(float x);
private:
diff --git a/src/components/heartrate/HeartRateController.cpp b/src/components/heartrate/HeartRateController.cpp
index d0b0d513..e84d665a 100644
--- a/src/components/heartrate/HeartRateController.cpp
+++ b/src/components/heartrate/HeartRateController.cpp
@@ -4,38 +4,35 @@
using namespace Pinetime::Controllers;
-HeartRateController::HeartRateController(Pinetime::System::SystemTask &systemTask) : systemTask{systemTask} {
-
+HeartRateController::HeartRateController(Pinetime::System::SystemTask& systemTask) : systemTask {systemTask} {
}
-
void HeartRateController::Update(HeartRateController::States newState, uint8_t heartRate) {
this->state = newState;
- if(this->heartRate != heartRate) {
+ if (this->heartRate != heartRate) {
this->heartRate = heartRate;
service->OnNewHeartRateValue(heartRate);
}
}
void HeartRateController::Start() {
- if(task != nullptr) {
+ if (task != nullptr) {
state = States::NotEnoughData;
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StartMeasurement);
}
}
void HeartRateController::Stop() {
- if(task != nullptr) {
+ if (task != nullptr) {
state = States::Stopped;
task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StopMeasurement);
}
}
-void HeartRateController::SetHeartRateTask(Pinetime::Applications::HeartRateTask *task) {
+void HeartRateController::SetHeartRateTask(Pinetime::Applications::HeartRateTask* task) {
this->task = task;
}
-void HeartRateController::SetService(Pinetime::Controllers::HeartRateService *service) {
+void HeartRateController::SetService(Pinetime::Controllers::HeartRateService* service) {
this->service = service;
}
-
diff --git a/src/components/heartrate/HeartRateController.h b/src/components/heartrate/HeartRateController.h
index 001111b5..d3a8460d 100644
--- a/src/components/heartrate/HeartRateController.h
+++ b/src/components/heartrate/HeartRateController.h
@@ -13,7 +13,7 @@ namespace Pinetime {
namespace Controllers {
class HeartRateController {
public:
- enum class States { Stopped, NotEnoughData, NoTouch, Running};
+ enum class States { Stopped, NotEnoughData, NoTouch, Running };
explicit HeartRateController(System::SystemTask& systemTask);
@@ -22,10 +22,14 @@ namespace Pinetime {
void Update(States newState, uint8_t heartRate);
void SetHeartRateTask(Applications::HeartRateTask* task);
- States State() const { return state; }
- uint8_t HeartRate() const { return heartRate; }
+ States State() const {
+ return state;
+ }
+ uint8_t HeartRate() const {
+ return heartRate;
+ }
- void SetService(Pinetime::Controllers::HeartRateService *service);
+ void SetService(Pinetime::Controllers::HeartRateService* service);
private:
System::SystemTask& systemTask;
diff --git a/src/components/heartrate/Ppg.cpp b/src/components/heartrate/Ppg.cpp
index e84cbdf3..da0789e0 100644
--- a/src/components/heartrate/Ppg.cpp
+++ b/src/components/heartrate/Ppg.cpp
@@ -11,25 +11,25 @@ using namespace Pinetime::Controllers;
/** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
namespace {
- int Compare(int* d1, int* d2, size_t count) {
+ int Compare(int8_t* d1, int8_t* d2, size_t count) {
int e = 0;
- for(size_t i = 0; i < count; i++) {
+ for (size_t i = 0; i < count; i++) {
auto d = d1[i] - d2[i];
e += d * d;
}
return e;
}
- int CompareShift(int* d, int shift, size_t count) {
- return Compare(d +shift, d, count - shift);
+ int CompareShift(int8_t* d, int shift, size_t count) {
+ return Compare(d + shift, d, count - shift);
}
- int Trough(int* d, size_t size, float mn, float mx) {
- auto z2 = CompareShift(d, mn-2, size);
- auto z1 = CompareShift(d, mn-1, size);
- for(int i = mn; i < mx + 1; i++) {
+ int Trough(int8_t* d, size_t size, uint8_t mn, uint8_t mx) {
+ auto z2 = CompareShift(d, mn - 2, size);
+ auto z1 = CompareShift(d, mn - 1, size);
+ for (int i = mn; i < mx + 1; i++) {
auto z = CompareShift(d, i, size);
- if(z2 > z1 && z1 < z)
+ if (z2 > z1 && z1 < z)
return i;
z2 = z1;
z1 = z;
@@ -38,28 +38,28 @@ namespace {
}
}
-Ppg::Ppg(float spl) : offset{spl},
- 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} {
-
+Ppg::Ppg(float spl)
+ : offset {spl},
+ 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} {
}
-int Ppg::Preprocess(float spl) {
+int8_t Ppg::Preprocess(float spl) {
spl -= offset;
spl = hpf.Step(spl);
spl = agc.Step(spl);
spl = lpf.Step(spl);
- auto spl_int = static_cast<int>(spl);
+ auto spl_int = static_cast<int8_t>(spl);
- if(dataIndex < 200)
+ if (dataIndex < 200)
data[dataIndex++] = spl_int;
return spl_int;
}
float Ppg::HeartRate() {
- if(dataIndex < 200)
+ if (dataIndex < 200)
return 0;
NRF_LOG_INFO("PREPROCESS, offset = %d", offset);
@@ -71,26 +71,26 @@ float Ppg::HeartRate() {
int cccount = 0;
float Ppg::ProcessHeartRate() {
- if(cccount > 2)
+ if (cccount > 2)
asm("nop");
- cccount ++;
+ cccount++;
auto t0 = Trough(data.data(), dataIndex, 7, 48);
- if(t0 < 0)
+ if (t0 < 0)
return 0;
float t1 = t0 * 2;
- t1 = Trough(data.data(), dataIndex, t1-5, t1+5);
- if(t1 < 0)
+ t1 = Trough(data.data(), dataIndex, t1 - 5, t1 + 5);
+ if (t1 < 0)
return 0;
float t2 = static_cast<int>(t1 * 3) / 2;
t2 = Trough(data.data(), dataIndex, t2 - 5, t2 + 5);
- if(t2 < 0)
+ if (t2 < 0)
return 0;
float t3 = static_cast<int>(t2 * 4) / 3;
t3 = Trough(data.data(), dataIndex, t3 - 4, t3 + 4);
- if(t3 < 0)
+ if (t3 < 0)
return static_cast<int>(60 * 24 * 3) / static_cast<int>(t2);
return static_cast<int>(60 * 24 * 4) / static_cast<int>(t3);
diff --git a/src/components/heartrate/Ppg.h b/src/components/heartrate/Ppg.h
index 747ae019..ee07dfcf 100644
--- a/src/components/heartrate/Ppg.h
+++ b/src/components/heartrate/Ppg.h
@@ -10,22 +10,21 @@ namespace Pinetime {
public:
explicit Ppg(float spl);
- int Preprocess(float spl);
+ int8_t Preprocess(float spl);
float HeartRate();
void SetOffset(uint16_t i);
void Reset();
private:
- std::array<int, 200> data;
+ std::array<int8_t, 200> data;
size_t dataIndex = 0;
float offset;
Biquad hpf;
Ptagc agc;
Biquad lpf;
-
float ProcessHeartRate();
};
}
-} \ No newline at end of file
+}
diff --git a/src/components/heartrate/Ptagc.cpp b/src/components/heartrate/Ptagc.cpp
index dd7c4411..e358371e 100644
--- a/src/components/heartrate/Ptagc.cpp
+++ b/src/components/heartrate/Ptagc.cpp
@@ -10,17 +10,16 @@
using namespace Pinetime::Controllers;
/** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
-Ptagc::Ptagc(float start, float decay, float threshold) : peak{start}, decay{decay}, boost{1.0f/decay}, threshold{threshold} {
-
+Ptagc::Ptagc(float start, float decay, float threshold) : peak {start}, decay {decay}, boost {1.0f / decay}, threshold {threshold} {
}
float Ptagc::Step(float spl) {
- if(std::abs(spl) > peak)
+ if (std::abs(spl) > peak)
peak *= boost;
else
peak *= decay;
- if((spl > (peak * threshold)) || (spl < (peak * -threshold)))
+ if ((spl > (peak * threshold)) || (spl < (peak * -threshold)))
return 0.0f;
spl = 100.0f * spl / (2.0f * peak);
diff --git a/src/components/heartrate/Ptagc.h b/src/components/heartrate/Ptagc.h
index c20de4c0..3476636b 100644
--- a/src/components/heartrate/Ptagc.h
+++ b/src/components/heartrate/Ptagc.h
@@ -12,7 +12,6 @@ namespace Pinetime {
float decay;
float boost;
float threshold;
-
};
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 21:41:36 +0000