From 7df39994abbccdb19385c22ba75b731d29bc696d Mon Sep 17 00:00:00 2001 From: Patric Gruber Date: Sat, 31 Aug 2024 20:49:19 +0200 Subject: [PATCH] integrate code review --- src/components/settings/Settings.cpp | 1 - src/heartratetask/HeartRateTask.cpp | 10 ++++------ src/heartratetask/HeartRateTask.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/components/settings/Settings.cpp b/src/components/settings/Settings.cpp index 05ab23d4..49073e1a 100644 --- a/src/components/settings/Settings.cpp +++ b/src/components/settings/Settings.cpp @@ -13,7 +13,6 @@ void Settings::Init() { } void Settings::SaveSettings() { - // verify if is necessary to save if (settingsChanged) { SaveSettingsToFile(); diff --git a/src/heartratetask/HeartRateTask.cpp b/src/heartratetask/HeartRateTask.cpp index b19f6fcd..0c082a5d 100644 --- a/src/heartratetask/HeartRateTask.cpp +++ b/src/heartratetask/HeartRateTask.cpp @@ -10,10 +10,8 @@ TickType_t CurrentTaskDelay(HeartRateTask::States state, TickType_t ppgDeltaTms) case HeartRateTask::States::ScreenOnAndMeasuring: case HeartRateTask::States::ScreenOffAndMeasuring: return ppgDeltaTms; - case HeartRateTask::States::ScreenOnAndStopped: - return pdMS_TO_TICKS(100); case HeartRateTask::States::ScreenOffAndWaiting: - return pdMS_TO_TICKS(10000); + return pdMS_TO_TICKS(1000); default: return portMAX_DELAY; } @@ -207,7 +205,7 @@ void HeartRateTask::HandleSensorData(int* lastBpm) { if (bpm != 0) { *lastBpm = bpm; controller.Update(Controllers::HeartRateController::States::Running, bpm); - if (state == States::ScreenOnAndMeasuring || IsContinuosModeActivated()) { + if (state == States::ScreenOnAndMeasuring || IsContinuousModeActivated()) { return; } if (state == States::ScreenOffAndMeasuring) { @@ -216,7 +214,7 @@ void HeartRateTask::HandleSensorData(int* lastBpm) { } } TickType_t ticksSinceMeasurementStart = xTaskGetTickCount() - measurementStart; - if (bpm == 0 && state == States::ScreenOffAndMeasuring && !IsContinuosModeActivated() && + if (bpm == 0 && state == States::ScreenOffAndMeasuring && !IsContinuousModeActivated() && ticksSinceMeasurementStart >= DURATION_UNTIL_BACKGROUND_MEASUREMENT_IS_STOPPED) { state = States::ScreenOffAndWaiting; StartWaiting(); @@ -251,7 +249,7 @@ TickType_t HeartRateTask::GetHeartRateBackgroundMeasurementIntervalInTicks() { return pdMS_TO_TICKS(ms); } -bool HeartRateTask::IsContinuosModeActivated() { +bool HeartRateTask::IsContinuousModeActivated() { return settings.GetHeartRateBackgroundMeasurementInterval() == Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::Continuous; } diff --git a/src/heartratetask/HeartRateTask.h b/src/heartratetask/HeartRateTask.h index 511e34f3..f7d7e38b 100644 --- a/src/heartratetask/HeartRateTask.h +++ b/src/heartratetask/HeartRateTask.h @@ -56,7 +56,7 @@ namespace Pinetime { void HandleSensorData(int* lastBpm); TickType_t GetHeartRateBackgroundMeasurementIntervalInTicks(); - bool IsContinuosModeActivated(); + bool IsContinuousModeActivated(); bool IsBackgroundMeasurementActivated(); TaskHandle_t taskHandle;