diff options
author | Avamander <avamander@gmail.com> | 2021-12-03 16:28:17 +0200 |
---|---|---|
committer | Avamander <avamander@gmail.com> | 2021-12-04 22:03:40 +0200 |
commit | 62bb6b51634b22410a96f1ca9cbe183d1e9c504c (patch) | |
tree | 562b53b0eac91281d443d9f1e57e36ed0995a697 /src/displayapp/DisplayApp.cpp | |
parent | 58d454b11fe3c143b37aea90772c122321a5b902 (diff) |
Better cleanup, bugfixes and improvements in weather parsing. UI improvements
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r-- | src/displayapp/DisplayApp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 80155187..d45251b9 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -1,5 +1,6 @@ #include "displayapp/DisplayApp.h" #include <libraries/log/nrf_log.h> +#include <displayapp/screens/Weather.h> #include "displayapp/screens/HeartRate.h" #include "displayapp/screens/Motion.h" #include "displayapp/screens/Timer.h" @@ -439,7 +440,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::Music>(this, systemTask->nimble().music()); break; case Apps::Navigation: - currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation()); + currentScreen = std::make_unique<Screens::Weather>(this, systemTask->nimble().weather()); + // currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation()); break; case Apps::HeartRate: currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask); @@ -451,6 +453,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) case Apps::Motion: currentScreen = std::make_unique<Screens::Motion>(this, motionController); break; + case Apps::Weather: + currentScreen = std::make_unique<Screens::Weather>(this, systemTask->nimble().weather()); + break; case Apps::Steps: currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController); break; |