summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/InfiniPaint.cpp7
-rw-r--r--src/displayapp/screens/InfiniPaint.h6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 85a5e826..66391b12 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -4,7 +4,7 @@
using namespace Pinetime::Applications::Screens;
-InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : Screen(app), lvgl {lvgl} {
+InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl, Pinetime::Controllers::MotorController& motor) : Screen(app), lvgl {lvgl}, motor{motor} {
std::fill(b, b + bufferSize, selectColor);
}
@@ -16,9 +16,6 @@ bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
switch (event) {
case Pinetime::Applications::TouchEvents::LongTap:
switch (color) {
- case 0:
- selectColor = LV_COLOR_MAGENTA;
- break;
case 1:
selectColor = LV_COLOR_GREEN;
break;
@@ -43,11 +40,13 @@ bool InfiniPaint::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
default:
color = 0;
+ selectColor = LV_COLOR_MAGENTA;
break;
}
std::fill(b, b + bufferSize, selectColor);
color++;
+ motor.RunForDuration(50);
return true;
default:
return true;
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index 0a70e033..8a96fc6d 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -3,6 +3,7 @@
#include <lvgl/lvgl.h>
#include <cstdint>
#include "Screen.h"
+#include "components/motor/MotorController.h"
namespace Pinetime {
namespace Components {
@@ -13,7 +14,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,12 +24,13 @@ 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;
lv_color_t b[bufferSize];
lv_color_t selectColor = LV_COLOR_WHITE;
- uint8_t color = 2;
+ uint8_t color = 3;
};
}
}