Heartrate measurements in background

src/CMakeLists.txt

@@ -412,6 +412,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingWeatherFormat.cpp
         displayapp/screens/settings/SettingWakeUp.cpp
         displayapp/screens/settings/SettingDisplay.cpp
+        displayapp/screens/settings/SettingHeartRate.cpp
         displayapp/screens/settings/SettingSteps.cpp
         displayapp/screens/settings/SettingSetDateTime.cpp
         displayapp/screens/settings/SettingSetDate.cpp

src/components/settings/Settings.cpp

@@ -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();

src/components/settings/Settings.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <cstdint>
 #include <bitset>
+#include <optional>
 #include "components/brightness/BrightnessController.h"
 #include "components/fs/FS.h"
 #include "displayapp/apps/Apps.h"
@@ -50,6 +51,8 @@ namespace Pinetime {
         int colorIndex = 0;
       };
 
+      std::optional<uint16_t> heartRateBackgroundMeasurement = 0;
+
       Settings(Pinetime::Controllers::FS& fs);
 
       Settings(const Settings&) = delete;
@@ -298,10 +301,32 @@ namespace Pinetime {
         return bleRadioEnabled;
       };
 
+      bool IsHeartRateBackgroundMeasurementActivated() const {
+        return settings.heartRateBackgroundMeasurement.has_value();
+      }
+
+      void DeactivateHeartRateBackgroundMeasurement() {
+        if (IsHeartRateBackgroundMeasurementActivated()) {
+          settingsChanged = true;
+        }
+        settings.heartRateBackgroundMeasurement = std::nullopt;
+      }
+
+      uint16_t GetHeartRateBackgroundMeasurementInterval() const {
+        return settings.heartRateBackgroundMeasurement.value_or(0);
+      }
+
+      void SetHeartRateBackgroundMeasurementInterval(uint16_t newIntervalInSeconds) {
+        if (!settings.heartRateBackgroundMeasurement.has_value() || newIntervalInSeconds != settings.heartRateBackgroundMeasurement) {
+          settingsChanged = true;
+        }
+        settings.heartRateBackgroundMeasurement = newIntervalInSeconds;
+      }
+
     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 +350,8 @@ namespace Pinetime {
         uint16_t shakeWakeThreshold = 150;
 
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+
+        std::optional<uint16_t> heartRateBackgroundMeasurement;
       };
 
       SettingsData settings;

src/displayapp/DisplayApp.cpp

@@ -48,6 +48,7 @@
 #include "displayapp/screens/settings/SettingSteps.h"
 #include "displayapp/screens/settings/SettingSetDateTime.h"
 #include "displayapp/screens/settings/SettingChimes.h"
+#include "displayapp/screens/settings/SettingHeartRate.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingBluetooth.h"
 
@@ -603,6 +604,9 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::SettingWakeUp:
       currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
       break;
+    case Apps::SettingHeartRate:
+      currentScreen = std::make_unique<Screens::SettingHeartRate>(settingsController);
+      break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(settingsController);
       break;

src/displayapp/apps/Apps.h.in

@@ -36,6 +36,7 @@ namespace Pinetime {
       SettingWatchFace,
       SettingTimeFormat,
       SettingWeatherFormat,
+      SettingHeartRate,
       SettingDisplay,
       SettingWakeUp,
       SettingSteps,

src/displayapp/screens/settings/SettingHeartRate.cpp

@@ -0,0 +1,85 @@
+#include "displayapp/screens/settings/SettingHeartRate.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+#include <array>
+#include <algorithm>
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  void event_handler(lv_obj_t* obj, lv_event_t event) {
+    auto* screen = static_cast<SettingHeartRate*>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
+
+  lv_obj_t* container = lv_cont_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_pad_inner(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+
+  lv_obj_set_pos(container, 10, 60);
+  lv_obj_set_width(container, LV_HOR_RES - 20);
+  lv_obj_set_height(container, LV_VER_RES - 50);
+  lv_cont_set_layout(container, LV_LAYOUT_PRETTY_TOP);
+
+  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);
+
+  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
+  lv_label_set_text_static(icon, Symbols::heartBeat);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  bool isActivated = settingsController.IsHeartRateBackgroundMeasurementActivated();
+  unsigned int currentInterval = settingsController.GetHeartRateBackgroundMeasurementInterval();
+
+  for (unsigned int i = 0; i < options.size(); i++) {
+    cbOption[i] = lv_checkbox_create(container, nullptr);
+    lv_checkbox_set_text(cbOption[i], options[i].name);
+    cbOption[i]->user_data = this;
+    lv_obj_set_event_cb(cbOption[i], event_handler);
+    SetRadioButtonStyle(cbOption[i]);
+
+    if (!isActivated && options[i].intervalInSeconds == -1) {
+      lv_checkbox_set_checked(cbOption[i], true);
+    } else if (isActivated && options[i].intervalInSeconds == static_cast<int>(currentInterval)) {
+      lv_checkbox_set_checked(cbOption[i], true);
+    }
+  }
+}
+
+SettingHeartRate::~SettingHeartRate() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+void SettingHeartRate::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+  if (event == LV_EVENT_CLICKED) {
+    for (unsigned int i = 0; i < options.size(); i++) {
+      if (object == cbOption[i]) {
+        lv_checkbox_set_checked(cbOption[i], true);
+
+        int optionInterval = options[i].intervalInSeconds;
+
+        if (optionInterval == -1) {
+          settingsController.DeactivateHeartRateBackgroundMeasurement();
+        } else {
+          settingsController.SetHeartRateBackgroundMeasurementInterval(static_cast<uint16_t>(optionInterval));
+        }
+      } else {
+        lv_checkbox_set_checked(cbOption[i], false);
+      }
+    }
+  }
+}

src/displayapp/screens/settings/SettingHeartRate.h

@@ -0,0 +1,47 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+
+#include "components/settings/Settings.h"
+#include "displayapp/screens/ScreenList.h"
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
+#include "displayapp/screens/CheckboxList.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      struct Option {
+        const int intervalInSeconds;
+        const char* name;
+      };
+
+      class SettingHeartRate : public Screen {
+      public:
+        SettingHeartRate(Pinetime::Controllers::Settings& settings);
+        ~SettingHeartRate() override;
+
+        void UpdateSelected(lv_obj_t* object, lv_event_t event);
+
+      private:
+        Pinetime::Controllers::Settings& settingsController;
+
+        static constexpr std::array<Option, 8> options = {{
+          {-1, " Off"},
+          {0, "Cont"},
+          {15, " 15s"},
+          {30, " 30s"},
+          {60, "  1m"},
+          {5 * 60, "  5m"},
+          {10 * 60, " 10m"},
+          {30 * 60, " 30m"},
+        }};
+
+        lv_obj_t* cbOption[options.size()];
+      };
+    }
+  }
+}

src/displayapp/screens/settings/Settings.h

@@ -38,22 +38,19 @@ namespace Pinetime {
           {Symbols::home, "Watch face", Apps::SettingWatchFace},
 
           {Symbols::shoe, "Steps", Apps::SettingSteps},
+          {Symbols::heartBeat, "Heartrate", Apps::SettingHeartRate},
           {Symbols::clock, "Date & Time", Apps::SettingSetDateTime},
           {Symbols::cloudSunRain, "Weather", Apps::SettingWeatherFormat},
-          {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
 
+          {Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
           {Symbols::clock, "Chimes", Apps::SettingChimes},
           {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
           {Symbols::check, "Firmware", Apps::FirmwareValidation},
-          {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
 
+          {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
           {Symbols::list, "About", Apps::SysInfo},
-
-          // {Symbols::none, "None", Apps::None},
-          // {Symbols::none, "None", Apps::None},
-          // {Symbols::none, "None", Apps::None},
-          // {Symbols::none, "None", Apps::None},
-
+          {Symbols::none, "None", Apps::None},
+          {Symbols::none, "None", Apps::None},
         }};
         ScreenList<nScreens> screens;
       };