This may have been a bad idea

Author: Louis Pearson

src/components/stopwatch/StopWatchController.cpp

@@ -0,0 +1,46 @@
+#include "StopWatchController.h"
+#include <cstdlib>
+#include <cstring>
+
+using namespace Pinetime::Controllers;
+
+StopWatch::StopWatch() {}
+
+// StopWatch::init() {}
+
+void StopWatch::start(uint32_t start) {
+  currentState = StopWatchStates::Running;
+  startTime = start;
+}
+
+// void StopWatch::lap(uint32_t lapEnd);
+
+void StopWatch::pause(uint32_t end) {
+  currentState = StopWatchStates::Paused;
+  timeElapsedPreviously += end - startTime;
+}
+
+void StopWatch::clear() {
+  currentState = StopWatchStates::Cleared;
+  timeElapsedPreviously = 0;
+}
+
+uint32_t StopWatch::getStart() {
+  return startTime;
+}
+
+uint32_t StopWatch::getElapsedPreviously() {
+  return timeElapsedPreviously;
+}
+
+bool StopWatch::isRunning() {
+  return currentState == StopWatchStates::Running;
+}
+
+bool StopWatch::isClear() {
+  return currentState == StopWatchStates::Cleared;
+}
+
+bool StopWatch::isPaused() {
+  return currentState == StopWatchStates::Paused;
+}

src/components/stopwatch/StopWatchController.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include "portmacro_cmsis.h"
+
+namespace Pinetime {
+  namespace System {
+    class SystemTask;
+  }
+  namespace Controllers {
+
+    enum class StopWatchStates { Cleared, Running, Paused };
+
+    class StopWatch {
+    public:
+      StopWatch() = default;
+
+      // void init();
+      void start(uint32_t start);
+      // void lap(uint32_t lapEnd);
+      void pause(uint32_t end);
+      void clear();
+
+      uint32_t getStart();
+      uint32_t getElapsedPreviously();
+
+      bool isRunning();
+      bool isCleared();
+      bool isPaused();
+
+    private:
+        StopWatchStates currentState = StopWatchStates::Cleared;
+      // Start time of current duration
+        TickType_t startTime;
+      // How much time was elapsed before current duration
+        TickType_t timeElapsedPreviously = 0;
+    };
+  }
+}

src/displayapp/DisplayApp.cpp

@@ -10,6 +10,7 @@
 #include "components/ble/NotificationManager.h"
 #include "components/motion/MotionController.h"
 #include "components/motor/MotorController.h"
+#include "components/stopwatch/StopWatchController.h"
 #include "displayapp/screens/ApplicationList.h"
 #include "displayapp/screens/Brightness.h"
 #include "displayapp/screens/Clock.h"
@@ -95,6 +96,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
                        Pinetime::Controllers::MotionController& motionController,
                        Pinetime::Controllers::TimerController& timerController,
                        Pinetime::Controllers::AlarmController& alarmController,
+                       Pinetime::Controllers::StopWatchController& stopWatchController,
                        Pinetime::Controllers::TouchHandler& touchHandler)
   : lcd {lcd},
     lvgl {lvgl},
@@ -110,6 +112,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
     motionController {motionController},
     timerController {timerController},
     alarmController {alarmController},
+    stopWatchController {stopWatchController},
     touchHandler {touchHandler} {
 }
 
@@ -404,7 +407,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::StopWatch:
-      currentScreen = std::make_unique<Screens::StopWatch>(this, *systemTask, dateTimeController);
+      currentScreen = std::make_unique<Screens::StopWatch>(this, *systemTask, dateTimeController, stopWatchController);
       break;
     case Apps::Twos:
       currentScreen = std::make_unique<Screens::Twos>(this);

src/displayapp/DisplayApp.h

@@ -16,6 +16,7 @@
 #include "components/timer/TimerController.h"
 #include "components/alarm/AlarmController.h"
 #include "touchhandler/TouchHandler.h"
+#include "components/stopwatch/StopWatchController.h"
 
 #include "Messages.h"
 #include "BootErrors.h"
@@ -36,6 +37,7 @@ namespace Pinetime {
     class HeartRateController;
     class MotionController;
     class TouchHandler;
+    class StopWatchController;
   }
 
   namespace System {
@@ -61,6 +63,7 @@ namespace Pinetime {
                  Pinetime::Controllers::MotionController& motionController,
                  Pinetime::Controllers::TimerController& timerController,
                  Pinetime::Controllers::AlarmController& alarmController,
+                 Pinetime::Controllers::StopWatch& stopWatchController,
                  Pinetime::Controllers::TouchHandler& touchHandler);
       void Start(System::BootErrors error);
       void PushMessage(Display::Messages msg);
@@ -88,6 +91,7 @@ namespace Pinetime {
       Pinetime::Controllers::TimerController& timerController;
       Pinetime::Controllers::AlarmController& alarmController;
       Pinetime::Controllers::TouchHandler& touchHandler;
+      Pinetime::Controllers::StopWatchController& stopWatchController;
 
       Pinetime::Controllers::FirmwareValidator validator;
       Controllers::BrightnessController brightnessController;

src/displayapp/screens/StopWatch.cpp

@@ -45,13 +45,12 @@ static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
   stopWatch->stopLapBtnEventHandler(event);
 }
 
-StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask, Controllers::DateTime& dateTimeController)
+StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask, Controllers::DateTime& dateTimeController, Controllers::StopWatch& stopWatchController)
   : Screen(app),
     systemTask {systemTask},
     dateTimeController {dateTimeController},
-    currentState {States::Init},
-    startTime {},
-    oldTimeElapsed {},
+    stopWatchController {stopWatchController},
+    timeElapsed {},
     currentTimeSeparated {},
     lapBuffer {},
     lapNr {} {
@@ -120,8 +119,8 @@ StopWatch::~StopWatch() {
 }
 
 void StopWatch::reset() {
-  currentState = States::Init;
-  oldTimeElapsed = 0;
+  stopWatchController.clear();
+
   lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
   lv_obj_set_style_local_text_color(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
 
@@ -137,34 +136,34 @@ void StopWatch::reset() {
 }
 
 void StopWatch::start() {
+  stopWatchController.start(xTaskGetTickCount());
+
   lv_obj_set_state(btnStopLap, LV_STATE_DEFAULT);
   lv_obj_set_state(txtStopLap, LV_STATE_DEFAULT);
   lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
   lv_obj_set_style_local_text_color(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
   lv_label_set_text(txtPlayPause, Symbols::pause);
   lv_label_set_text(txtStopLap, Symbols::lapsFlag);
-  startTime = xTaskGetTickCount();
-  currentState = States::Running;
+
   systemTask.PushMessage(Pinetime::System::Messages::DisableSleeping);
 }
 
 void StopWatch::pause() {
-  startTime = 0;
-  // Store the current time elapsed in cache
-  oldTimeElapsed += timeElapsed;
-  currentState = States::Halted;
+  stopWatchController.pause(xTaskGetTickCount());
+
   lv_label_set_text(txtPlayPause, Symbols::play);
   lv_label_set_text(txtStopLap, Symbols::stop);
   lv_obj_set_style_local_text_color(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_set_style_local_text_color(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
+
   systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
 }
 
 void StopWatch::Refresh() {
   lv_label_set_text_fmt(dateTime, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
-  if (currentState == States::Running) {
-    timeElapsed = calculateDelta(startTime, xTaskGetTickCount());
-    currentTimeSeparated = convertTicksToTimeSegments((oldTimeElapsed + timeElapsed));
+  if (stopWatchController.isRunning()) {
+    timeElapsed = calculateDelta(stopWatchController.getStart(), xTaskGetTickCount());
+    currentTimeSeparated = convertTicksToTimeSegments((stopWatchController.getElapsedPreviously() + timeElapsed));
 
     lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
     lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
@@ -175,12 +174,10 @@ void StopWatch::playPauseBtnEventHandler(lv_event_t event) {
   if (event != LV_EVENT_CLICKED) {
     return;
   }
-  if (currentState == States::Init) {
-    start();
-  } else if (currentState == States::Running) {
-    pause();
-  } else if (currentState == States::Halted) {
-    start();
+  if (stopWatchController.isCleared() || stopWatchController.isPaused()) {
+    stopWatchController.start(xTaskGetTickCount());
+  } else if (stopWatchController.isRunning()) {
+    stopWatchController.pause(xTaskGetTickCount());
   }
 }
 
@@ -189,7 +186,7 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
     return;
   }
   // If running, then this button is used to save laps
-  if (currentState == States::Running) {
+  if (stopWatchController.isRunning()) {
     lapBuffer.addLaps(currentTimeSeparated);
     lapNr++;
     if (lapBuffer[1]) {
@@ -199,14 +196,14 @@ void StopWatch::stopLapBtnEventHandler(lv_event_t event) {
     if (lapBuffer[0]) {
       lv_label_set_text_fmt(lapTwoText, "#%2d   %2d:%02d.%02d", lapNr, lapBuffer[0]->mins, lapBuffer[0]->secs, lapBuffer[0]->hundredths);
     }
-  } else if (currentState == States::Halted) {
+  } else if (stopWatchController.isPaused()) {
     reset();
   }
 }
 
 bool StopWatch::OnButtonPushed() {
-  if (currentState == States::Running) {
-    pause();
+  if (stopWatchController.isRunning()) {
+    stopWatchController.pause(xTaskGetTickCount());
     return true;
   }
   return false;

src/displayapp/screens/StopWatch.h

@@ -64,7 +64,8 @@ namespace Pinetime::Applications::Screens {
   public:
     StopWatch(DisplayApp* app,
               System::SystemTask& systemTask,
-              Controllers::DateTime& dateTimeController);
+              Controllers::DateTime& dateTimeController,
+              Controllers::StopWatch& stopWatchController);
     ~StopWatch() override;
     void Refresh() override;
 
@@ -79,17 +80,14 @@ namespace Pinetime::Applications::Screens {
   private:
     Pinetime::System::SystemTask& systemTask;
     Controllers::DateTime& dateTimeController;
+    Controllers::StopWatch& stopWatchController;
 
     TickType_t timeElapsed;
-    States currentState;
-    TickType_t startTime;
-    TickType_t oldTimeElapsed;
     TimeSeparated_t currentTimeSeparated; // Holds Mins, Secs, millisecs
     LapTextBuffer_t<2> lapBuffer;
     int lapNr = 0;
-    lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
+    lv_obj_t *dateTime, *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
     lv_obj_t *lapOneText, *lapTwoText;
-    lv_obj_t *dateTime;
 
     lv_task_t* taskRefresh;
   };

src/systemtask/SystemTask.cpp

@@ -66,6 +66,7 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
                        Controllers::DateTime& dateTimeController,
                        Controllers::TimerController& timerController,
                        Controllers::AlarmController& alarmController,
+                       Controllers::StopWatch& stopWatchController,
                        Drivers::Watchdog& watchdog,
                        Pinetime::Controllers::NotificationManager& notificationManager,
                        Pinetime::Controllers::MotorController& motorController,
@@ -89,6 +90,7 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
     dateTimeController {dateTimeController},
     timerController {timerController},
     alarmController {alarmController},
+    stopWatchController {stopWatchController},
     watchdog {watchdog},
     notificationManager {notificationManager},
     motorController {motorController},

src/systemtask/SystemTask.h

@@ -18,6 +18,7 @@
 #include "components/motor/MotorController.h"
 #include "components/timer/TimerController.h"
 #include "components/alarm/AlarmController.h"
+#include "components/stopwatch/StopWatchController.h"
 #include "components/fs/FS.h"
 #include "touchhandler/TouchHandler.h"
 
@@ -60,6 +61,7 @@ namespace Pinetime {
                  Controllers::DateTime& dateTimeController,
                  Controllers::TimerController& timerController,
                  Controllers::AlarmController& alarmController,
+                 Controllers::StopWatch& stopWatchController,
                  Drivers::Watchdog& watchdog,
                  Pinetime::Controllers::NotificationManager& notificationManager,
                  Pinetime::Controllers::MotorController& motorController,
@@ -118,6 +120,7 @@ namespace Pinetime {
       Pinetime::Controllers::Settings& settingsController;
       Pinetime::Controllers::HeartRateController& heartRateController;
       Pinetime::Controllers::MotionController& motionController;
+      Pinetime::Controllers::StopWatch& stopWatchController;
 
       Pinetime::Applications::DisplayApp& displayApp;
       Pinetime::Applications::HeartRateTask& heartRateApp;