diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-12-02 20:42:56 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-12-02 20:42:56 (GMT) |
| commit | 1404d0186c83d2d805bb5daa1f2de84c52e59b42 (patch) | |
| tree | 315cd89d4183180aa3d1ec66ab73dc454c68c933 /src/displayapp/DisplayApp.cpp | |
| parent | a17d8bd566ae7686b9373dc3f2ab218d3a191630 (diff) | |
| parent | 75f0bbb7ca51fa0aa65c8c3d4081a5e8d8d48c55 (diff) | |
Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration
# Conflicts:
# src/displayapp/screens/InfiniPaint.h
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 38ce930..8015518 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -430,7 +430,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::Twos>(this); break; case Apps::Paint: - currentScreen = std::make_unique<Screens::InfiniPaint>(this, lvgl); + currentScreen = std::make_unique<Screens::InfiniPaint>(this, lvgl, motorController); break; case Apps::Paddle: currentScreen = std::make_unique<Screens::Paddle>(this, lvgl); |
