summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-30 20:50:42 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-30 20:50:42 (GMT)
commit5db030547eeb0aae422447ddb63f0bd2f9d5f384 (patch)
tree648bdc9654a3d826eaef1cefaa4b329495016569 /src/displayapp/DisplayApp.cpp
parente1cb4f64097a7d084f178f762546cecb5bd3c6be (diff)
Revert "sans heart"ultraredux-heart
This reverts commit 6ef420d2407a4685b56a233f6b0f849e90c6cf49.
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r--src/displayapp/DisplayApp.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 574f964..fe1da06 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/HeartRate.h"
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "components/datetime/DateTimeController.h"
@@ -68,6 +69,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
Controllers::DateTime& dateTimeController,
Drivers::WatchdogView& watchdog,
Pinetime::Controllers::NotificationManager& notificationManager,
+ Pinetime::Controllers::HeartRateController& heartRateController,
Controllers::Settings& settingsController,
Pinetime::Controllers::MotorController& motorController,
Pinetime::Controllers::MotionController& motionController,
@@ -81,6 +83,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
dateTimeController {dateTimeController},
watchdog {watchdog},
notificationManager {notificationManager},
+ heartRateController {heartRateController},
settingsController {settingsController},
motorController {motorController},
motionController {motionController},
@@ -296,6 +299,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
bleController,
notificationManager,
settingsController,
+ heartRateController,
motionController);
break;
@@ -344,6 +348,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
break;
+ case Apps::HeartRate:
+ currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask);
+ break;
}
currentApp = app;
}