diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-01-20 20:34:09 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-01-20 20:34:09 (GMT) |
| commit | 522a1eb0beaabb607b1f123993ec2f09be8a775b (patch) | |
| tree | 419bfe41495e6a2e56334db41990ba2fb6d33f16 /src/displayapp/DisplayApp.cpp | |
| parent | a0f2fa8469f3a2c0f5f2f914ad174029da321cc0 (diff) | |
Merge branch piggz/nav into develop:
- fix conflict
- add a icon for the navigation app.
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 7ae9f81..b6ad90b 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; |