will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/displayapp/screens/InfiniPaint.h
This commit is contained in:
Jean-François Milants
2021-12-02 21:42:56 +01:00
parent a17d8bd566 75f0bbb7ca
commit 1404d0186c
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/displayapp/screens/InfiniPaint.h
View File

@@ -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;