From 522a1eb0beaabb607b1f123993ec2f09be8a775b Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Wed, 20 Jan 2021 21:34:09 +0100 Subject: Merge branch piggz/nav into develop: - fix conflict - add a icon for the navigation app. --- src/displayapp/DisplayApp.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/displayapp/DisplayApp.cpp') diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 7ae9f819..b6ad90b4 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -15,6 +15,7 @@ #include "displayapp/screens/Paddle.h" #include "displayapp/screens/Meter.h" #include "displayapp/screens/Music.h" +#include "displayapp/screens/Navigation.h" #include "displayapp/screens/Notifications.h" #include "displayapp/screens/SystemInfo.h" #include "displayapp/screens/Tile.h" @@ -212,6 +213,7 @@ void DisplayApp::RunningState() { case Apps::Paddle: currentScreen.reset(new Screens::Paddle(this, lvgl)); break; case Apps::Brightness : currentScreen.reset(new Screens::Brightness(this, brightnessController)); break; case Apps::Music : currentScreen.reset(new Screens::Music(this, systemTask.nimble().music())); break; + case Apps::Navigation : currentScreen.reset(new Screens::Navigation(this, systemTask.nimble().navigation())); break; case Apps::FirmwareValidation: currentScreen.reset(new Screens::FirmwareValidation(this, validator)); break; case Apps::Notifications: currentScreen.reset(new Screens::Notifications(this, notificationManager, Screens::Notifications::Modes::Normal)); break; case Apps::HeartRate: currentScreen.reset(new Screens::HeartRate(this, heartRateController)); break; -- cgit v1.2.3-70-g09d2