Merge branch 'heartrate-measurements-in-background'
This commit is contained in:
commit
7d8e58d863
11 changed files with 397 additions and 73 deletions
|
|
@ -8,13 +8,11 @@ Settings::Settings(Pinetime::Controllers::FS& fs) : fs {fs} {
|
|||
}
|
||||
|
||||
void Settings::Init() {
|
||||
|
||||
// Load default settings from Flash
|
||||
LoadSettingsFromFile();
|
||||
}
|
||||
|
||||
void Settings::SaveSettings() {
|
||||
|
||||
// verify if is necessary to save
|
||||
if (settingsChanged) {
|
||||
SaveSettingsToFile();
|
||||
|
|
|
|||
|
|
@ -50,6 +50,17 @@ namespace Pinetime {
|
|||
int colorIndex = 0;
|
||||
};
|
||||
|
||||
enum class HeartRateBackgroundMeasurementInterval : uint8_t {
|
||||
Off,
|
||||
Continuous,
|
||||
TenSeconds,
|
||||
ThirtySeconds,
|
||||
OneMinute,
|
||||
FiveMinutes,
|
||||
TenMinutes,
|
||||
ThirtyMinutes,
|
||||
};
|
||||
|
||||
Settings(Pinetime::Controllers::FS& fs);
|
||||
|
||||
Settings(const Settings&) = delete;
|
||||
|
|
@ -298,10 +309,21 @@ namespace Pinetime {
|
|||
return bleRadioEnabled;
|
||||
};
|
||||
|
||||
HeartRateBackgroundMeasurementInterval GetHeartRateBackgroundMeasurementInterval() const {
|
||||
return settings.heartRateBackgroundMeasurementInterval;
|
||||
}
|
||||
|
||||
void SetHeartRateBackgroundMeasurementInterval(HeartRateBackgroundMeasurementInterval newHeartRateBackgroundMeasurementInterval) {
|
||||
if (newHeartRateBackgroundMeasurementInterval != settings.heartRateBackgroundMeasurementInterval) {
|
||||
settingsChanged = true;
|
||||
}
|
||||
settings.heartRateBackgroundMeasurementInterval = newHeartRateBackgroundMeasurementInterval;
|
||||
}
|
||||
|
||||
private:
|
||||
Pinetime::Controllers::FS& fs;
|
||||
|
||||
static constexpr uint32_t settingsVersion = 0x0008;
|
||||
static constexpr uint32_t settingsVersion = 0x0009;
|
||||
|
||||
struct SettingsData {
|
||||
uint32_t version = settingsVersion;
|
||||
|
|
@ -325,6 +347,8 @@ namespace Pinetime {
|
|||
uint16_t shakeWakeThreshold = 150;
|
||||
|
||||
Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
|
||||
|
||||
HeartRateBackgroundMeasurementInterval heartRateBackgroundMeasurementInterval = HeartRateBackgroundMeasurementInterval::Off;
|
||||
};
|
||||
|
||||
SettingsData settings;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue