resolves conflicts

1 files changed, 5 insertions, 2 deletions

diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 0a70e03..8c42740 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -2,7 +2,9 @@
 
 #include <lvgl/lvgl.h>
 #include <cstdint>
-#include "Screen.h"
+#include <algorithm> // std::fill
+#include "displayapp/screens/Screen.h"
+#include "components/motor/MotorController.h"
 
 namespace Pinetime {
   namespace Components {
@@ -13,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;
 
@@ -23,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;