Merge branch 'develop' of JF/PineTime into master

1 files changed, 6 insertions, 3 deletions

diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 964ccbf..1a4e0eb 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -17,6 +17,7 @@ namespace Pinetime {
     class Battery;
     class Ble;
     class NotificationManager;
+    class MotionController;
   }
 
   namespace Applications {
@@ -29,11 +30,12 @@ namespace Pinetime {
                   Controllers::Ble& bleController,
                   Controllers::NotificationManager& notificatioManager,
                   Controllers::Settings &settingsController,
-                  Controllers::HeartRateController& heartRateController);
+                  Controllers::HeartRateController& heartRateController,
+                  Controllers::MotionController& motionController);
           ~Clock() override;
 
           bool Refresh() override;
-          bool OnButtonPushed() override;
+          
           bool OnTouchEvent(TouchEvents event) override;
 
         private:
@@ -44,6 +46,7 @@ namespace Pinetime {
           Controllers::NotificationManager& notificatioManager;
           Controllers::Settings& settingsController;
           Controllers::HeartRateController& heartRateController;
+          Controllers::MotionController& motionController;
 
 
           ScreenList<2> screens;
@@ -54,7 +57,7 @@ namespace Pinetime {
           //std::unique_ptr<Screen> WatchFaceMinimalScreen();
           //std::unique_ptr<Screen> WatchFaceCustomScreen();
 
-          bool running = true;
+          
 
       };
     }