diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-08-14 19:54:00 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-08-14 19:54:00 (GMT) |
| commit | 0eeed5ac33a655367a3da9fb93ddc515970cd16a (patch) | |
| tree | 913f71a229336809e2472321a1e21b4c438b295d /src/displayapp/DisplayApp.cpp | |
| parent | dec4bab33496527e43850742a4b3dafd753eab83 (diff) | |
| parent | f9319dfb91a38c773b4af221f2fd0d975cf061f2 (diff) | |
Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime into Riksu9000-call-improvements
# Conflicts:
# src/displayapp/screens/Metronome.cpp
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 49a56a0..5150162 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -336,12 +336,12 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) case Apps::Notifications: currentScreen = std::make_unique<Screens::Notifications>( - this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Normal); + this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Normal); ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp); break; case Apps::NotificationsPreview: currentScreen = std::make_unique<Screens::Notifications>( - this, notificationManager, systemTask->nimble().alertService(), Screens::Notifications::Modes::Preview); + this, notificationManager, systemTask->nimble().alertService(), motorController, Screens::Notifications::Modes::Preview); ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp); break; case Apps::Timer: |