Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration

# Conflicts:
#	src/displayapp/screens/InfiniPaint.h

1 files changed, 3 insertions, 1 deletions

diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index bc0bca2..8c42740 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -4,6 +4,7 @@
 #include <cstdint>
 #include <algorithm> // std::fill
 #include "displayapp/screens/Screen.h"
+#include "components/motor/MotorController.h"
 
 namespace Pinetime {
   namespace Components {
@@ -14,7 +15,7 @@ namespace Pinetime {
 
       class InfiniPaint : public Screen {
       public:
-        InfiniPaint(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
+        InfiniPaint(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl, Controllers::MotorController& motor);
 
         ~InfiniPaint() override;
 
@@ -24,6 +25,7 @@ namespace Pinetime {
 
       private:
         Pinetime::Components::LittleVgl& lvgl;
+        Controllers::MotorController& motor;
         static constexpr uint16_t width = 10;
         static constexpr uint16_t height = 10;
         static constexpr uint16_t bufferSize = width * height;