Add heart rate zone screen

Author: Andersama

src/CMakeLists.txt

@@ -403,6 +403,7 @@ list(APPEND SOURCE_FILES
         displayapp/widgets/PageIndicator.cpp
         displayapp/widgets/DotIndicator.cpp
         displayapp/widgets/StatusIcons.cpp
+        displayapp/screens/HeartRateZone.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp

src/components/heartrate/HeartRateController.cpp

@@ -4,22 +4,34 @@
 
 using namespace Pinetime::Controllers;
 
+HeartRateZoneSettings::HeartRateZoneSettings() {
+  version = 0;
+  adjustMsDelay = 300000;
+  age = 25;
+  maxHeartRate = maxHeartRateEstimate(age);
+  percentTarget = {50, 60, 70, 80, 90};
+  bpmTarget = bpmZones(percentTarget, maxHeartRate);
+  allowCalibration = true;
+};
+
+HeartRateController::HeartRateController(Pinetime::Controllers::FS& fs) : fs {fs} {};
+
 void HeartRateController::Update(HeartRateController::States newState, uint8_t heartRate) {
   this->state = newState;
   if (this->heartRate != heartRate) {
     uint32_t ts = xTaskGetTickCount();
     uint32_t z;
     zone = 0;
-    auto adjustMax = pdMS_TO_TICKS(zoneSettings.adjustDelay);
-    for (z = zoneSettings.bpmTarget.size() - 1; i < zoneSettings.bpmTarget.size(); --i) {
-      if (this->heartRate >= zoneSettings.bpmTarget[i]) {
+    auto adjustMax = pdMS_TO_TICKS(this->zSettings.adjustMsDelay);
+    for (z = this->zSettings.bpmTarget.size() - 1; z < this->zSettings.bpmTarget.size(); --z) {
+      if (this->heartRate >= this->zSettings.bpmTarget[z]) {
         uint32_t dt = ts - lastActiveTime;
-        currentActivity.zoneTime[i] += dt;
+        currentActivity.zoneTime[z] += dt;
         zone = z + 1;
         // don't make increases unless this is consistantly higher than normal (zone 5 is max)
-        if (zoneSettings.allowCalibration && zone >= 5 && dt > adjustMax) {
-          zoneSettings.maxHeartRate = zoneSettings.maxHeartRate >= this->heartRate ? zoneSettings.maxHeartRate : this->heartRate;
-          zoneSettings.bpmTarget = bpmZones(zoneSettings.percentTarget, zoneSettings.maxHeartRate);
+        if (this->zSettings.allowCalibration && zone >= 5 && dt > adjustMax) {
+          this->zSettings.maxHeartRate = this->zSettings.maxHeartRate >= this->heartRate ? this->zSettings.maxHeartRate : this->heartRate;
+          this->zSettings.bpmTarget = bpmZones(this->zSettings.percentTarget, this->zSettings.maxHeartRate);
         }
         break;
       }
@@ -36,8 +48,9 @@ void HeartRateController::AdvanceDay() {
   HeartRateZones<uint16_t> convertedActivity {};
   auto ticksPerSecond = pdMS_TO_TICKS(1000);
 
+  auto totalTime = currentActivity.totalTime();
   for (uint32_t i = 0; i < convertedActivity.zoneTime.size(); i++) {
-    convertedActivity.zoneTime[i] = fixed_rounding(currentActivity.totalTime, ticksPerSecond);
+    convertedActivity.zoneTime[i] = fixed_rounding(totalTime, ticksPerSecond);
   }
 
   activity[0] = convertedActivity;
@@ -56,9 +69,9 @@ void HeartRateController::SaveSettingsToFile() const {
     return;
   }
 
-  fs.FileWrite(&heartRateZoneFile, reinterpret_cast<const uint8_t*>(&zoneSettings), sizeof(zoneSettings));
+  fs.FileWrite(&heartRateZoneFile, reinterpret_cast<const uint8_t*>(&(this->zSettings)), sizeof(this->zSettings));
   fs.FileClose(&heartRateZoneFile);
-  NRF_LOG_INFO("[HeartRateController] Saved heart rate zone settings with format version %u to file", zoneSettings.version);
+  NRF_LOG_INFO("[HeartRateController] Saved heart rate zone settings with format version %u to file", this->zSettings.version);
 
   lfs_file_t zoneDataFile;
   if (fs.FileOpen(&zoneDataFile, "/.system/hrz.dat", LFS_O_WRONLY | LFS_O_CREAT) != LFS_ERR_OK) {
@@ -68,8 +81,7 @@ void HeartRateController::SaveSettingsToFile() const {
 
   fs.FileWrite(&zoneDataFile, reinterpret_cast<const uint8_t*>(&activity), sizeof(activity));
   fs.FileClose(&zoneDataFile);
-  NRF_LOG_INFO("[HeartRateController] Saved heart rate zone data with format version %u to file", zoneSettings.version);
-
+  NRF_LOG_INFO("[HeartRateController] Saved heart rate zone data with format version %u to file", this->zSettings.version);
 }
 
 void HeartRateController::Enable() {

src/components/heartrate/HeartRateController.h

@@ -3,6 +3,7 @@
 #include <cstdint>
 #include <components/ble/HeartRateService.h>
 #include "utility/CircularBuffer.h"
+#include "components/fs/FS.h"
 #include <array>
 
 namespace Pinetime {
@@ -18,7 +19,7 @@ namespace Pinetime {
     template <typename T>
     struct HeartRateZones {
       // 1440 minutes in a day (11 bits), 86400 seconds (17 bits)
-      T zoneTime[5] = {};
+      std::array<T,5> zoneTime = {};
 
       T totalTime() const {
         return zoneTime[0] + zoneTime[1] + zoneTime[2] + zoneTime[3] + zoneTime[4];
@@ -48,21 +49,21 @@ namespace Pinetime {
 
     struct HeartRateZoneSettings {
       uint32_t version = 0;
+      uint32_t adjustMsDelay = 300000;
       uint8_t age = 25;
-      uint8_t maxHeartRate = maxHeartRateEstimate(age);
+      uint8_t maxHeartRate = 195;
       std::array<uint8_t, 5> percentTarget = {50, 60, 70, 80, 90};
-      std::array<uint8_t, 5> bpmTarget = bpmZones(percentTarget, maxHeartRate);
-      uint32_t adjustMsDelay = 300000;
+      std::array<uint8_t, 5> bpmTarget = {98, 117, 137, 156, 176};
       bool allowCalibration = true;
-    };
 
-    HeartRateZoneSettings zoneSettings {};
+      HeartRateZoneSettings();
+    };
 
     class HeartRateController {
     public:
       enum class States : uint8_t { Stopped, NotEnoughData, NoTouch, Running };
 
-      HeartRateController() = default;
+      HeartRateController(Pinetime::Controllers::FS& fs);
       void Enable();
       void Disable();
       void Update(States newState, uint8_t heartRate);
@@ -88,14 +89,16 @@ namespace Pinetime {
       void SetService(Pinetime::Controllers::HeartRateService* service);
 
       void AdvanceDay();
-      void SaveSettingsToFile();
+      void SaveSettingsToFile() const;
 
     private:
       Applications::HeartRateTask* task = nullptr;
       States state = States::Stopped;
       uint8_t heartRate = 0;
       Pinetime::Controllers::HeartRateService* service = nullptr;
+      Pinetime::Controllers::FS& fs;
 
+      HeartRateZoneSettings zSettings = {};
       uint32_t lastActiveTime = 0;
       // Heart Rate Zone Storage
       HeartRateZones<uint32_t> currentActivity = {};

src/displayapp/DisplayApp.cpp

@@ -31,6 +31,7 @@
 #include "displayapp/screens/PassKey.h"
 #include "displayapp/screens/Error.h"
 #include "displayapp/screens/Calculator.h"
+#include "displayapp/screens/HeartRateZone.h"
 
 #include "drivers/Cst816s.h"
 #include "drivers/St7789.h"

src/displayapp/UserApps.h

@@ -7,6 +7,7 @@
 #include "displayapp/screens/Timer.h"
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/Tile.h"
+#include "displayapp/screens/HeartRateZone.h"
 #include "displayapp/screens/ApplicationList.h"
 #include "displayapp/screens/WatchFaceDigital.h"
 #include "displayapp/screens/WatchFaceAnalog.h"

src/displayapp/apps/Apps.h.in

@@ -22,6 +22,7 @@ namespace Pinetime {
       Paddle,
       Twos,
       HeartRate,
+      HeartRateZone,
       Navigation,
       StopWatch,
       Metronome,

src/displayapp/apps/CMakeLists.txt

@@ -6,6 +6,7 @@ else ()
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Timer")
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Steps")
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::HeartRate")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::HeartRateZone")
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Music")
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paint")
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paddle")

src/displayapp/screens/HeartRateZone.cpp

@@ -1,38 +1,14 @@
 #include "displayapp/screens/HeartRateZone.h"
 #include <lvgl/lvgl.h>
-#include <lvgl/lv_obj_style.h>
 #include <components/heartrate/HeartRateController.h>
 
 #include "displayapp/DisplayApp.h"
 #include "displayapp/InfiniTimeTheme.h"
 
 using namespace Pinetime::Applications::Screens;
 
-namespace {
-  const char* ToString(Pinetime::Controllers::HeartRateController::States s) {
-    switch (s) {
-      case Pinetime::Controllers::HeartRateController::States::NotEnoughData:
-        return "Not enough data,\nplease wait...";
-      case Pinetime::Controllers::HeartRateController::States::NoTouch:
-        return "No touch detected";
-      case Pinetime::Controllers::HeartRateController::States::Running:
-        return "Measuring...";
-      case Pinetime::Controllers::HeartRateController::States::Stopped:
-        return "Stopped";
-    }
-    return "";
-  }
-
-  void btnStartStopEventHandler(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<HeartRate*>(obj->user_data);
-    screen->OnStartStopEvent(event);
-  }
-}
-
 HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateController, System::SystemTask& systemTask)
   : heartRateController {heartRateController}, wakeLock(systemTask) {
-  bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
-
   auto activity = heartRateController.Activity();
   uint32_t total = 0;
 
@@ -42,13 +18,12 @@ HeartRateZone::HeartRateZone(Controllers::HeartRateController& heartRateControll
   for (uint8_t i = 0; i < zone_bar.size(); i++) {
     zone_bar[i] = lv_bar_create(screen, nullptr);
 
-    //lv_bar_set_orientation(zone_bar[i], LV_BAR_ORIENTATION_HORIZONTAL);
     total += activity.zoneTime[i];
     lv_obj_set_style_local_line_color(zone_bar[i], LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
     lv_obj_set_size(zone_bar[i], 240, 20);
     lv_obj_align(zone_bar[i], nullptr, LV_ALIGN_IN_TOP_LEFT, 10, 25 * i);
 
-    label_time[i] = lv_label_create(zone_bar[i]);
+    label_time[i] = lv_label_create(zone_bar[i],nullptr);
     lv_obj_align(zone_bar[i], nullptr, LV_ALIGN_CENTER, 0, 0);
   }
 

src/displayapp/screens/HeartRateZone.h

@@ -25,22 +25,13 @@ namespace Pinetime {
 
         void Refresh() override;
 
-        void OnStartStopEvent(lv_event_t event);
-
       private:
         Controllers::HeartRateController& heartRateController;
         Pinetime::System::WakeLock wakeLock;
-        void UpdateStartStopButton(bool isRunning);
 
         std::array<lv_obj_t*,5> zone_bar;
         std::array<lv_obj_t*,5> label_time;
-        /*
-        lv_obj_t* label_hr;
-        lv_obj_t* label_bpm;
-        lv_obj_t* label_status;
-        lv_obj_t* btn_startStop;
-        lv_obj_t* label_startStop;
-        */
+
         lv_task_t* taskRefresh;
       };
     }

src/heartratetask/HeartRateTask.cpp

@@ -1,6 +1,6 @@
 #include "heartratetask/HeartRateTask.h"
 #include <drivers/Hrs3300.h>
-#include <components/heartrate/HeartRateController.h>
+
 #include <limits>
 
 using namespace Pinetime::Applications;