implement suggestions from code review

Author: patgruber

src/displayapp/screens/settings/SettingHeartRate.cpp

@@ -15,21 +15,19 @@ namespace {
   }
 }
 
-constexpr std::array<Option, 8> SettingHeartRate::options;
-
 SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
 
-  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
+  lv_obj_t* container = 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, 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);
+  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(container1, 10, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 20);
-  lv_obj_set_height(container1, LV_VER_RES - 50);
-  lv_cont_set_layout(container1, LV_LAYOUT_PRETTY_TOP);
+  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");
@@ -47,7 +45,7 @@ SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsCont
   unsigned int currentInterval = settingsController.GetHeartRateBackgroundMeasurementInterval();
 
   for (unsigned int i = 0; i < options.size(); i++) {
-    cbOption[i] = lv_checkbox_create(container1, nullptr);
+    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);

src/heartratetask/HeartRateTask.cpp

@@ -213,23 +213,22 @@ void HeartRateTask::HandleSensorData(int* lastBpm) {
   // !IsContinuousModeActivated()
 
   if (ShouldStartBackgroundMeasuring()) {
-    // This doesn't change the state but resets the measurment timer, which basically starts the next measurment without resetting the
-    // sensor. This is basically a fall back to continuous mode, when measurments take too long.
+    // This doesn't change the state but resets the measurement timer, which basically starts the next measurement without resetting the
+    // sensor. This is basically a fall back to continuous mode, when measurements take too long.
     measurementStart = xTaskGetTickCount();
     return;
   }
 
-  bool noDataWithinTimeLimit = bpm == 0 && ShoudStopTryingToGetData();
-  bool dataWithinTimeLimit = bpm != 0;
-  if (dataWithinTimeLimit || noDataWithinTimeLimit) {
+  bool dataTimeout = bpm == 0 && ShouldStopTryingToGetData();
+  bool foundHeartrate = bpm != 0;
+  if (foundHeartrate || dataTimeout) {
     state = States::ScreenOffAndWaiting;
     StopMeasurement();
   }
 }
 
 TickType_t HeartRateTask::GetBackgroundIntervalInTicks() {
-  int ms = settings.GetHeartRateBackgroundMeasurementInterval() * 1000;
-  return pdMS_TO_TICKS(ms);
+  return settings.GetHeartRateBackgroundMeasurementInterval() * configTICK_RATE_HZ;
 }
 
 bool HeartRateTask::IsContinuousModeActivated() {
@@ -244,10 +243,10 @@ TickType_t HeartRateTask::GetTicksSinceLastMeasurementStarted() {
   return xTaskGetTickCount() - measurementStart;
 }
 
-bool HeartRateTask::ShoudStopTryingToGetData() {
-  return GetTicksSinceLastMeasurementStarted() >= DURATION_UNTIL_BACKGROUND_MEASUREMENT_IS_STOPPED;
+bool HeartRateTask::ShouldStopTryingToGetData() {
+  return GetTicksSinceLastMeasurementStarted() >= durationUntilBackgroundMeasurementIsStopped;
 }
 
 bool HeartRateTask::ShouldStartBackgroundMeasuring() {
   return GetTicksSinceLastMeasurementStarted() >= GetBackgroundIntervalInTicks();
-}
+}

src/heartratetask/HeartRateTask.h

@@ -5,8 +5,6 @@
 #include <components/heartrate/Ppg.h>
 #include "components/settings/Settings.h"
 
-#define DURATION_UNTIL_BACKGROUND_MEASUREMENT_IS_STOPPED pdMS_TO_TICKS(30 * 1000)
-
 /*
                *** Background Measurement deactivated ***
 
@@ -81,6 +79,7 @@ namespace Pinetime {
       void Start();
       void Work();
       void PushMessage(Messages msg);
+      static constexpr int durationUntilBackgroundMeasurementIsStopped = pdMS_TO_TICKS(30 * 1000);
 
     private:
       static void Process(void* instance);
@@ -100,7 +99,7 @@ namespace Pinetime {
       bool IsBackgroundMeasurementActivated();
 
       TickType_t GetTicksSinceLastMeasurementStarted();
-      bool ShoudStopTryingToGetData();
+      bool ShouldStopTryingToGetData();
       bool ShouldStartBackgroundMeasuring();
 
       TaskHandle_t taskHandle;