diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-06-12 15:14:14 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-06-12 15:14:14 +0200 |
commit | d6fcbe960e595e53e3f24cbaae0cbb0505ad6dc2 (patch) | |
tree | d53a0c8232698f27a53e76c94c139fd6b7156e45 /src | |
parent | c575754b4283ab1e8a2b1320a97992db6712ac58 (diff) |
Fix build issues since Metronome app has been merged.
Diffstat (limited to 'src')
-rw-r--r-- | src/displayapp/DisplayApp.cpp | 2 | ||||
-rw-r--r-- | src/displayapp/screens/Metronome.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index cd25c979..ab73969d 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -358,7 +358,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask); break; case Apps::Metronome: - currentScreen = std::make_unique<Screens::Metronome>(this, motorController, systemTask); + currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask); break; case Apps::Motion: currentScreen = std::make_unique<Screens::Motion>(this, motionController); diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp index c536e301..7bfbccb7 100644 --- a/src/displayapp/screens/Metronome.cpp +++ b/src/displayapp/screens/Metronome.cpp @@ -89,7 +89,7 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl Metronome::~Metronome() { app->SetTouchMode(DisplayApp::TouchModes::Gestures); - systemTask.PushMessage(Pinetime::System::SystemTask::Messages::EnableSleeping); + systemTask.PushMessage(System::Messages::EnableSleeping); lv_obj_clean(lv_scr_act()); } @@ -151,12 +151,12 @@ void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) { switch (currentState) { case States::Stopped: { lv_label_set_text(playPauseLabel, Symbols::play); - systemTask.PushMessage(Pinetime::System::SystemTask::Messages::EnableSleeping); + systemTask.PushMessage(System::Messages::EnableSleeping); break; } case States::Running: { lv_label_set_text(playPauseLabel, Symbols::pause); - systemTask.PushMessage(Pinetime::System::SystemTask::Messages::DisableSleeping); + systemTask.PushMessage(System::Messages::DisableSleeping); startTime = xTaskGetTickCount(); counter = 1; break; |