scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

use pdMS_TO_TICKS correctly, format using clang-format

Browse source
This commit is contained in:
Patric Gruber 2023-12-01 17:22:28 +01:00
parent 50d88bbe84
commit 4ed4d2cfcd
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/displayapp/screens/settings/SettingHeartRate.cpp
View file

@ -17,8 +17,7 @@ namespace {
constexpr std::array<Option, 8> SettingHeartRate::options;
SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsController)
: settingsController {settingsController} {
SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);

19
src/heartratetask/HeartRateTask.cpp
View file

@ -154,7 +154,8 @@ void HeartRateTask::HandleSensorData(int* lastBpm) {
state = States::BackgroundWaiting;
StartWaiting();
}
if (bpm == 0 && state == States::BackgroundMeasuring && xTaskGetTickCount() - measurementStart >= DURATION_UNTIL_BACKGROUND_MEASURMENT_IS_STOPPED) {
if (bpm == 0 && state == States::BackgroundMeasuring &&
xTaskGetTickCount() - measurementStart >= DURATION_UNTIL_BACKGROUND_MEASURMENT_IS_STOPPED) {
state = States::BackgroundWaiting;
StartWaiting();
}
@ -166,9 +167,9 @@ TickType_t HeartRateTask::CurrentTaskDelay() {
case States::BackgroundMeasuring:
return ppg.deltaTms;
case States::Running:
return 100 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(100);
case States::BackgroundWaiting:
return 10000 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(10000);
default:
return portMAX_DELAY;
}
@ -177,17 +178,17 @@ TickType_t HeartRateTask::CurrentTaskDelay() {
TickType_t HeartRateTask::GetHeartRateBackgroundMeasurementIntervalInTicks() {
switch (settings.GetHeartRateBackgroundMeasurementInterval()) {
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::TenSeconds:
return 10 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(10 * 1000);
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::ThirtySeconds:
return 30 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(30 * 1000);
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::OneMinute:
return 60 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(60 * 1000);
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::FiveMinutes:
return 5 * 60 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(5 * 60 * 1000);
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::TenMinutes:
return 10 * 60 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(10 * 60 * 1000);
case Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::ThirtyMinutes:
return 30 * 60 * pdMS_TO_TICKS;
return pdMS_TO_TICKS(30 * 60 * 1000);
default:
return 0;
}

2
src/heartratetask/HeartRateTask.h
View file

@ -5,7 +5,7 @@
#include <components/heartrate/Ppg.h>
#include "components/settings/Settings.h"
#define DURATION_UNTIL_BACKGROUND_MEASURMENT_IS_STOPPED 30 * pdMS_TO_TICKS
#define DURATION_UNTIL_BACKGROUND_MEASURMENT_IS_STOPPED pdMS_TO_TICKS(30 * 1000)
namespace Pinetime {
namespace Drivers {