HR Sensor : Add start/stop button to the HeartRate app (the HR sensors stays ON when the app is closed), display the HR value on the Clock app.

1 files changed, 50 insertions, 11 deletions

diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp
index 2d25f89c..d55ed019 100644
--- a/src/displayapp/screens/HeartRate.cpp
+++ b/src/displayapp/screens/HeartRate.cpp
@@ -8,13 +8,25 @@ using namespace Pinetime::Applications::Screens;
 extern lv_font_t jetbrains_mono_extrabold_compressed;
 extern lv_font_t jetbrains_mono_bold_20;
 
-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...";
+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 "";
+  }
+
+  static void btnStartStopEventHandler(lv_obj_t *obj, lv_event_t event) {
+    HeartRate *screen = static_cast<HeartRate *>(obj->user_data);
+    screen->OnStartStopEvent(event);
   }
-  return "";
 }
 
 HeartRate::HeartRate(Pinetime::Applications::DisplayApp *app, Controllers::HeartRateController& heartRateController) : Screen(app), heartRateController{heartRateController} {
@@ -30,7 +42,7 @@ HeartRate::HeartRate(Pinetime::Applications::DisplayApp *app, Controllers::Heart
 
   label_hr = lv_label_create(lv_scr_act(), NULL);
   lv_label_set_style(label_hr, LV_LABEL_STYLE_MAIN, &labelBigStyle);
-  lv_obj_align(label_hr, lv_scr_act(), LV_ALIGN_CENTER, -70, 0);
+  lv_obj_align(label_hr, lv_scr_act(), LV_ALIGN_CENTER, -70, -40);
   lv_label_set_text(label_hr, "000");
 
   lv_label_set_text(label_bpm, "Heart rate BPM");
@@ -40,13 +52,19 @@ HeartRate::HeartRate(Pinetime::Applications::DisplayApp *app, Controllers::Heart
   label_status = lv_label_create(lv_scr_act(), NULL);
   lv_label_set_text(label_status, ToString(Pinetime::Controllers::HeartRateController::States::NotEnoughData));
   lv_label_set_style(label_status, LV_LABEL_STYLE_MAIN, labelStyle);
-  lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+  lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
 
-  heartRateController.Start();
+  btn_startStop = lv_btn_create(lv_scr_act(), NULL);
+  btn_startStop->user_data = this;
+  lv_obj_set_height(btn_startStop, 50);
+  lv_obj_set_event_cb(btn_startStop, btnStartStopEventHandler);
+  lv_obj_align(btn_startStop, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+
+  label_startStop = lv_label_create(btn_startStop, nullptr);
+  UpdateStartStopButton(heartRateController.State() != Controllers::HeartRateController::States::Stopped);
 }
 
 HeartRate::~HeartRate() {
-  heartRateController.Stop();
   lv_obj_clean(lv_scr_act());
 }
 
@@ -57,6 +75,7 @@ bool HeartRate::Refresh() {
   switch(state) {
     case Controllers::HeartRateController::States::NoTouch:
     case Controllers::HeartRateController::States::NotEnoughData:
+    case Controllers::HeartRateController::States::Stopped:
       lv_label_set_text(label_hr, "000");
       break;
     default:
@@ -65,7 +84,7 @@ bool HeartRate::Refresh() {
   }
 
   lv_label_set_text(label_status, ToString(state));
-  lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
+  lv_obj_align(label_status, label_hr, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
 
   return running;
 }
@@ -74,3 +93,23 @@ bool HeartRate::OnButtonPushed() {
   running = false;
   return true;
 }
+
+void HeartRate::OnStartStopEvent(lv_event_t event) {
+  if (event == LV_EVENT_CLICKED) {
+    if(heartRateController.State() == Controllers::HeartRateController::States::Stopped) {
+      heartRateController.Start();
+      UpdateStartStopButton(heartRateController.State() != Controllers::HeartRateController::States::Stopped);
+    }
+    else {
+      heartRateController.Stop();
+      UpdateStartStopButton(heartRateController.State() != Controllers::HeartRateController::States::Stopped);
+    }
+  }
+}
+
+void HeartRate::UpdateStartStopButton(bool isRunning) {
+  if(isRunning)
+    lv_label_set_text(label_startStop, "Stop");
+  else
+    lv_label_set_text(label_startStop, "Start");
+}