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

use enum instead of uint32_t for heartrater interval setting

Browse source
This commit is contained in:
Patric Gruber 2023-08-26 20:35:39 +02:00
parent be1a519098
commit d376a856b7
5 changed files with 67 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ SettingHeartRate::SettingHeartRate(Pinetime::Applications::DisplayApp* app, Pine
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
@ -35,6 +35,7 @@ SettingHeartRate::SettingHeartRate(Pinetime::Applications::DisplayApp* app, Pine
lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(title, "Backg. Interval");
lv_label_set_text(title, "Backg. Interval");
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);

18
src/displayapp/screens/settings/SettingHeartRate.h
View file

@ -15,7 +15,7 @@ namespace Pinetime {
namespace Screens {
struct Option {
const uint32_t interval;
const Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval interval;
const char* name;
};
@ -31,14 +31,14 @@ namespace Pinetime {
Pinetime::Controllers::Settings& settingsController;
static constexpr std::array<Option, 8> options = {{
{0, "Off"},
{10, "10s"},
{30, "30s"},
{60, " 1m"},
{5 * 60, " 5m"},
{10 * 60, "10m"},
{30 * 60, "30m"},
{60 * 60, " 1h"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::Off, " Off"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::Continuous, "Cont"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::TenSeconds, " 10s"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::ThirtySeconds, " 30s"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::OneMinute, " 1m"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::FiveMinutes, " 5m"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::TenMinutes, " 10m"},
{Pinetime::Controllers::Settings::HeartRateBackgroundMeasurementInterval::ThirtyMinutes, " 30m"},
}};
lv_obj_t* cbOption[options.size()];