aboutsummaryrefslogtreecommitdiffstats
path: root/src/heartratetask/HeartRateTask.cpp
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-26 21:10:11 +0200
committerGitHub <noreply@github.com>2021-04-26 21:10:11 +0200
commit4706c99db4c1e05f9dd90f152f2dea08d8f22ab2 (patch)
treecf2bea6d67e8d91a7d6222b8e0b55a0075575003 /src/heartratetask/HeartRateTask.cpp
parente56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff)
parent69898545193a82f7d72c9f47c9d9de36167b157b (diff)
Merge pull request #293 from Avamander/patch-5
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/heartratetask/HeartRateTask.cpp')
-rw-r--r--src/heartratetask/HeartRateTask.cpp29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/heartratetask/HeartRateTask.cpp b/src/heartratetask/HeartRateTask.cpp
index 5a6d2a5e..36c8cc18 100644
--- a/src/heartratetask/HeartRateTask.cpp
+++ b/src/heartratetask/HeartRateTask.cpp
@@ -5,10 +5,8 @@
using namespace Pinetime::Applications;
-HeartRateTask::HeartRateTask(Drivers::Hrs3300 &heartRateSensor, Controllers::HeartRateController& controller) :
- heartRateSensor{heartRateSensor},
- controller{controller},
- ppg{static_cast<float>(heartRateSensor.ReadHrs())} {
+HeartRateTask::HeartRateTask(Drivers::Hrs3300& heartRateSensor, Controllers::HeartRateController& controller)
+ : heartRateSensor {heartRateSensor}, controller {controller}, ppg {static_cast<float>(heartRateSensor.ReadHrs())} {
messageQueue = xQueueCreate(10, 1);
controller.SetHeartRateTask(this);
}
@@ -18,8 +16,8 @@ void HeartRateTask::Start() {
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
}
-void HeartRateTask::Process(void *instance) {
- auto *app = static_cast<HeartRateTask *>(instance);
+void HeartRateTask::Process(void* instance) {
+ auto* app = static_cast<HeartRateTask*>(instance);
app->Work();
}
@@ -29,8 +27,10 @@ void HeartRateTask::Work() {
Messages msg;
uint32_t delay;
if (state == States::Running) {
- if (measurementStarted) delay = 40;
- else delay = 100;
+ if (measurementStarted)
+ delay = 40;
+ else
+ delay = 100;
} else
delay = portMAX_DELAY;
@@ -42,19 +42,21 @@ void HeartRateTask::Work() {
break;
case Messages::WakeUp:
state = States::Running;
- if(measurementStarted) {
+ if (measurementStarted) {
lastBpm = 0;
StartMeasurement();
}
break;
case Messages::StartMeasurement:
- if(measurementStarted) break;
+ if (measurementStarted)
+ break;
lastBpm = 0;
StartMeasurement();
measurementStarted = true;
break;
case Messages::StopMeasurement:
- if(!measurementStarted) break;
+ if (!measurementStarted)
+ break;
StopMeasurement();
measurementStarted = false;
break;
@@ -66,8 +68,9 @@ void HeartRateTask::Work() {
ppg.Preprocess(hrs);
auto bpm = ppg.HeartRate();
- if (lastBpm == 0 && bpm == 0) controller.Update(Controllers::HeartRateController::States::NotEnoughData, 0);
- if(bpm != 0) {
+ if (lastBpm == 0 && bpm == 0)
+ controller.Update(Controllers::HeartRateController::States::NotEnoughData, 0);
+ if (bpm != 0) {
lastBpm = bpm;
controller.Update(Controllers::HeartRateController::States::Running, lastBpm);
}