diff options
| author | JF002 <JF002@users.noreply.github.com> | 2020-07-26 15:58:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 15:58:57 +0200 |
| commit | 4f51d429a57342a16cd3d250a2b8387a8101c6ba (patch) | |
| tree | 90a388959c721ce8afd481f3f5ed47125b5aaf59 /src/DisplayApp/DisplayApp.cpp | |
| parent | c96a53e1a8d203e18ccda24b3754037fad12a6ca (diff) | |
| parent | 29b5caf895766ccca523faed2d3f88798ee571f4 (diff) | |
Merge branch 'develop' into patch-2
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 8e35ef55..46a96385 100644 --- a/src/DisplayApp/DisplayApp.cpp +++ b/src/DisplayApp/DisplayApp.cpp @@ -15,6 +15,7 @@ #include <DisplayApp/Screens/Gauge.h> #include <DisplayApp/Screens/Brightness.h> #include <DisplayApp/Screens/ScreenList.h> +#include <DisplayApp/Screens/Music.h> #include <Components/Ble/NotificationManager.h> #include <DisplayApp/Screens/FirmwareUpdate.h> #include "../SystemTask/SystemTask.h" @@ -189,6 +190,7 @@ void DisplayApp::RunningState() { case Apps::Meter: currentScreen.reset(new Screens::Meter(this)); break; case Apps::Gauge: currentScreen.reset(new Screens::Gauge(this)); 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; } nextApp = Apps::None; } |