From 61b75015287d46aa2454481fdf2f03fffce4f4e0 Mon Sep 17 00:00:00 2001 From: Finlay Davidson Date: Mon, 9 Jan 2023 17:52:51 +0100 Subject: [PATCH] Fix for activity notifications --- CMakeLists.txt | 2 ++ main.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2f1ba2..7249e85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,6 +182,8 @@ target_sources(infinisim PUBLIC ${InfiniTime_DIR}/src/displayapp/icons/bg_clock.c # used by WatchFaceAnalog.cpp ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.h ${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.cpp + ${InfiniTime_DIR}/src/components/activity/ActivityController.h + ${InfiniTime_DIR}/src/components/activity/ActivityController.cpp ${InfiniTime_DIR}/src/components/alarm/AlarmController.h ${InfiniTime_DIR}/src/components/alarm/AlarmController.cpp ${InfiniTime_DIR}/src/components/ble/BleController.h diff --git a/main.cpp b/main.cpp index b679d27..db56245 100644 --- a/main.cpp +++ b/main.cpp @@ -26,6 +26,7 @@ #include #include "BootloaderVersion.h" +#include "components/activity/ActivityController.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/ble/NotificationManager.h" @@ -353,6 +354,7 @@ Pinetime::Controllers::AlarmController alarmController {dateTimeController}; Pinetime::Controllers::TouchHandler touchHandler; Pinetime::Controllers::ButtonHandler buttonHandler; Pinetime::Controllers::BrightnessController brightnessController {}; +Pinetime::Controllers::ActivityController activityController(dateTimeController, settingsController); Pinetime::Applications::DisplayApp displayApp(lcd, touchPanel, @@ -395,7 +397,8 @@ Pinetime::System::SystemTask systemTask(spi, heartRateApp, fs, touchHandler, - buttonHandler); + buttonHandler, + activityController); // variable used in SystemTask.cpp Work loop std::chrono::time_point NoInit_BackUpTime;