diff options
| author | JF <jf@codingfield.com> | 2020-08-14 17:51:03 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2020-08-14 17:51:03 (GMT) |
| commit | 32f20fa994fec9e21d2af4d7bd287b94316b3970 (patch) | |
| tree | 00ad6d1e622b113b8e0a03f890703f5b7adeb8c1 /src/DisplayApp/DisplayApp.cpp | |
| parent | 27fa273d8315f972931dba7971a99b0fbba7360e (diff) | |
| parent | 6c678e872d51247f5e47730218598209e96bdd0a (diff) | |
Merge branch 'application-list' of JF/PineTime into develop
Diffstat (limited to 'src/DisplayApp/DisplayApp.cpp')
| -rw-r--r-- | src/DisplayApp/DisplayApp.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp index 46a9638..1a53046 100644 --- a/src/DisplayApp/DisplayApp.cpp +++ b/src/DisplayApp/DisplayApp.cpp @@ -2,22 +2,20 @@ #include <FreeRTOS.h> #include <task.h> #include <libraries/log/nrf_log.h> -#include <boards.h> #include <nrf_font.h> #include <queue.h> #include <Components/DateTime/DateTimeController.h> #include <drivers/Cst816s.h> #include <string> -#include <lvgl/lvgl.h> #include <DisplayApp/Screens/Tile.h> -#include <DisplayApp/Screens/Message.h> #include <DisplayApp/Screens/Meter.h> #include <DisplayApp/Screens/Gauge.h> #include <DisplayApp/Screens/Brightness.h> -#include <DisplayApp/Screens/ScreenList.h> +#include <DisplayApp/Screens/SystemInfo.h> #include <DisplayApp/Screens/Music.h> #include <Components/Ble/NotificationManager.h> #include <DisplayApp/Screens/FirmwareUpdate.h> +#include <DisplayApp/Screens/ApplicationList.h> #include "../SystemTask/SystemTask.h" using namespace Pinetime::Applications; @@ -180,13 +178,13 @@ void DisplayApp::RunningState() { onClockApp = false; switch(nextApp) { case Apps::None: - case Apps::Launcher: currentScreen.reset(new Screens::Tile(this)); break; + case Apps::Launcher: currentScreen.reset(new Screens::ApplicationList(this)); break; case Apps::Clock: currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController)); onClockApp = true; break; // case Apps::Test: currentScreen.reset(new Screens::Message(this)); break; - case Apps::SysInfo: currentScreen.reset(new Screens::ScreenList(this, dateTimeController, batteryController, brightnessController, bleController, watchdog)); break; + case Apps::SysInfo: currentScreen.reset(new Screens::SystemInfo(this, dateTimeController, batteryController, brightnessController, bleController, watchdog)); break; 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; @@ -238,7 +236,7 @@ TouchEvents DisplayApp::OnTouchEvent() { return TouchEvents::None; } -void DisplayApp::StartApp(DisplayApp::Apps app) { +void DisplayApp::StartApp(Apps app) { nextApp = app; } |