Advance day, start work on persistance

Author: theunknownartisthour

src/components/heartrate/HeartRateController.cpp

@@ -7,18 +7,19 @@ using namespace Pinetime::Controllers;
 void HeartRateController::Update(HeartRateController::States newState, uint8_t heartRate) {
   this->state = newState;
   if (this->heartRate != heartRate) {
-
     uint32_t ts = xTaskGetTickCount();
-    uint32_t zone;
-    //auto adjustMax = pdMS_TO_TICKS(300000); // 5 minutes
-    for (zone = zoneSettings.bpmTarget.size() - 1; i < zoneSettings.bpmTarget.size(); --i) {
+    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]) {
         uint32_t dt = ts - lastActiveTime;
         currentActivity.zoneTime[i] += dt;
-
+        zone = z + 1;
         // don't make increases unless this is consistantly higher than normal (zone 5 is max)
-        if (zone >= 4 && dt > zoneSettings.adjustDelay) {
-          zoneSettings.maxHeartRate = zoneSettings.maxHeartRate >= this->heartRate ? zoneSettings.maxHeartRate : this->heartRate;   
+        if (zoneSettings.allowCalibration && zone >= 5 && dt > adjustMax) {
+          zoneSettings.maxHeartRate = zoneSettings.maxHeartRate >= this->heartRate ? zoneSettings.maxHeartRate : this->heartRate;
+          zoneSettings.bpmTarget = bpmZones(zoneSettings.percentTarget, zoneSettings.maxHeartRate);
         }
         break;
       }
@@ -31,6 +32,46 @@ void HeartRateController::Update(HeartRateController::States newState, uint8_t h
   }
 }
 
+void HeartRateController::AdvanceDay() {
+  HeartRateZones<uint16_t> convertedActivity {};
+  auto ticksPerSecond = pdMS_TO_TICKS(1000);
+
+  for (uint32_t i = 0; i < convertedActivity.zoneTime.size(); i++) {
+    convertedActivity.zoneTime[i] = fixed_rounding(currentActivity.totalTime, ticksPerSecond);
+  }
+
+  activity[0] = convertedActivity;
+  activity++;
+}
+
+void HeartRateController::SaveSettingsToFile() const {
+  lfs_dir systemDir;
+  if (fs.DirOpen("/.system", &systemDir) != LFS_ERR_OK) {
+    fs.DirCreate("/.system");
+  }
+  fs.DirClose(&systemDir);
+  lfs_file_t heartRateZoneFile;
+  if (fs.FileOpen(&heartRateZoneFile, "/.system/hrzs.dat", LFS_O_WRONLY | LFS_O_CREAT) != LFS_ERR_OK) {
+    NRF_LOG_WARNING("[HeartRateController] Failed to open heart rate zone settings file for saving");
+    return;
+  }
+
+  fs.FileWrite(&heartRateZoneFile, reinterpret_cast<const uint8_t*>(&zoneSettings), sizeof(zoneSettings));
+  fs.FileClose(&heartRateZoneFile);
+  NRF_LOG_INFO("[HeartRateController] Saved heart rate zone settings with format version %u to file", zoneSettings.version);
+
+  lfs_file_t zoneDataFile;
+  if (fs.FileOpen(&zoneDataFile, "/.system/hrz.dat", LFS_O_WRONLY | LFS_O_CREAT) != LFS_ERR_OK) {
+    NRF_LOG_WARNING("[HeartRateController] Failed to open heart rate zone data file for saving");
+    return;
+  }
+
+  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);
+
+}
+
 void HeartRateController::Enable() {
   if (task != nullptr) {
     state = States::NotEnoughData;

src/components/heartrate/HeartRateController.h

@@ -15,10 +15,11 @@ namespace Pinetime {
   }
 
   namespace Controllers {
-    template<typename T>
+    template <typename T>
     struct HeartRateZones {
       // 1440 minutes in a day (11 bits), 86400 seconds (17 bits)
-      T zoneTime[5]   = {};
+      T zoneTime[5] = {};
+
       T totalTime() const {
         return zoneTime[0] + zoneTime[1] + zoneTime[2] + zoneTime[3] + zoneTime[4];
       }
@@ -30,27 +31,29 @@ namespace Pinetime {
 
     constexpr int16_t fixed_rounding(int16_t value, int16_t divisor) {
       // true evil: we use >>'s signed behavior to propagate the leading 1 across all bits, eg: we have 0xffff or 0x0000
-      int16_t signed_value = value >> 15u; 
+      int16_t signed_value = value >> 15u;
       int16_t half_divisor = (divisor / 2);
       return (value + half_divisor - (divisor & signed_value)) / divisor; // we replace the * by "1" with an &
     }
 
-    template<size_t N>
+    template <size_t N>
     constexpr std::array<uint8_t, N> bpmZones(std::array<uint8_t, N>& percentages, uint8_t maxBeatsPerMinute) {
       std::array<uint8_t, N> targets {};
       const uint16_t bpm = maxBeatsPerMinute;
       for (uint32_t i = 0; i < N; i++) {
-        targets[i++] = (uint8_t)fixed_rounding((uint16_t) percentages[i] * bpm, 100);
+        targets[i++] = (uint8_t) fixed_rounding((uint16_t) percentages[i] * bpm, 100);
       }
       return targets;
     };
 
     struct HeartRateZoneSettings {
+      uint32_t version = 0;
       uint8_t age = 25;
       uint8_t maxHeartRate = maxHeartRateEstimate(age);
       std::array<uint8_t, 5> percentTarget = {50, 60, 70, 80, 90};
-      std::array<uint8_t, 5> bpmTarget = bpmZones(percentTarget,maxHeartRate);
-      uint32_t adjustDelay = 300000;
+      std::array<uint8_t, 5> bpmTarget = bpmZones(percentTarget, maxHeartRate);
+      uint32_t adjustMsDelay = 300000;
+      bool allowCalibration = true;
     };
 
     HeartRateZoneSettings zoneSettings {};
@@ -74,8 +77,15 @@ namespace Pinetime {
         return heartRate;
       }
 
+      uint8_t Zone() const {
+        return zone;
+      }
+
       void SetService(Pinetime::Controllers::HeartRateService* service);
 
+      void AdvanceDay();
+      void SaveSettingsToFile();
+
     private:
       Applications::HeartRateTask* task = nullptr;
       States state = States::Stopped;
@@ -86,6 +96,7 @@ namespace Pinetime {
       // Heart Rate Zone Storage
       HeartRateZones<uint32_t> currentActivity = {};
       Utility::CircularBuffer<HeartRateZones<uint16_t>, 31> activity = {};
+      uint8_t zone = 0;
     };
   }
 }

src/systemtask/SystemTask.cpp

@@ -335,6 +335,7 @@ void SystemTask::Work() {
         case Messages::OnNewDay:
           motionSensor.ResetStepCounter();
           motionController.AdvanceDay();
+          heartRateController.AdvanceDay();
           break;
         case Messages::OnNewHour:
           using Pinetime::Controllers::AlarmController;