Implement stop watch controller

FintasticMan · Nov 30, 2021 · ec2b673 · ec2b673
1 parent c75102f
commit ec2b673
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -482,6 +482,7 @@ list(APPEND SOURCE_FILES
         components/motor/MotorController.cpp
         components/settings/Settings.cpp
         components/timer/TimerController.cpp
+        components/stopwatch/StopWatchController.cpp
         components/alarm/AlarmController.cpp
         components/fs/FS.cpp
         drivers/Cst816s.cpp

diff --git a/src/components/stopwatch/StopWatchController.cpp b/src/components/stopwatch/StopWatchController.cpp
@@ -4,7 +4,7 @@
 
 using namespace Pinetime::Controllers;
 
-StopWatch::StopWatch() {}
+// StopWatch::StopWatch() {}
 
 // StopWatch::init() {}
 
@@ -37,7 +37,7 @@ bool StopWatch::isRunning() {
   return currentState == StopWatchStates::Running;
 }
 
-bool StopWatch::isClear() {
+bool StopWatch::isCleared() {
   return currentState == StopWatchStates::Cleared;
 }
 

diff --git a/src/components/stopwatch/StopWatchController.h b/src/components/stopwatch/StopWatchController.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <cstdint>
-#include "portmacro_cmsis.h"
+// #include "portmacro_cmsis.h"
+#include "FreeRTOS.h"
 
 namespace Pinetime {
   namespace System {

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
@@ -96,7 +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::StopWatch& stopWatchController,
                        Pinetime::Controllers::TouchHandler& touchHandler)
   : lcd {lcd},
     lvgl {lvgl},

diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
@@ -37,7 +37,7 @@ namespace Pinetime {
     class HeartRateController;
     class MotionController;
     class TouchHandler;
-    class StopWatchController;
+    class StopWatch;
   }
 
   namespace System {
@@ -91,7 +91,7 @@ namespace Pinetime {
       Pinetime::Controllers::TimerController& timerController;
       Pinetime::Controllers::AlarmController& alarmController;
       Pinetime::Controllers::TouchHandler& touchHandler;
-      Pinetime::Controllers::StopWatchController& stopWatchController;
+      Pinetime::Controllers::StopWatch& stopWatchController;
 
       Pinetime::Controllers::FirmwareValidator validator;
       Controllers::BrightnessController brightnessController;

diff --git a/src/main.cpp b/src/main.cpp
@@ -36,6 +36,7 @@
 #include "components/motor/MotorController.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/heartrate/HeartRateController.h"
+#include "components/stopwatch/StopWatchController.h"
 #include "components/fs/FS.h"
 #include "drivers/Spi.h"
 #include "drivers/SpiMaster.h"
@@ -107,6 +108,7 @@ Pinetime::Drivers::WatchdogView watchdogView(watchdog);
 Pinetime::Controllers::NotificationManager notificationManager;
 Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::TimerController timerController;
+Pinetime::Controllers::StopWatch stopWatchController;
 Pinetime::Controllers::AlarmController alarmController {dateTimeController};
 Pinetime::Controllers::TouchHandler touchHandler(touchPanel, lvgl);
 Pinetime::Controllers::ButtonHandler buttonHandler;
@@ -129,6 +131,7 @@ Pinetime::Applications::DisplayApp displayApp(lcd,
                                               motionController,
                                               timerController,
                                               alarmController,
+                                              stopWatchController,
                                               touchHandler);
 
 Pinetime::System::SystemTask systemTask(spi,
@@ -142,6 +145,7 @@ Pinetime::System::SystemTask systemTask(spi,
                                         dateTimeController,
                                         timerController,
                                         alarmController,
+                                        stopWatchController,
                                         watchdog,
                                         notificationManager,
                                         motorController,