From bba67c9870839f88f1a613e7f492280a3bba6125 Mon Sep 17 00:00:00 2001 From: minacode Date: Mon, 19 Dec 2022 13:33:47 +0100 Subject: [PATCH 1/2] patched includes --- CMakeLists.txt | 4 ++-- main.cpp | 2 +- sim/components/ble/AlertNotificationService.cpp | 2 +- sim/components/ble/NimbleController.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24c6c33..1ce0513 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,8 +204,8 @@ target_sources(infinisim PUBLIC ${InfiniTime_DIR}/src/components/datetime/DateTimeController.cpp ${InfiniTime_DIR}/src/components/settings/Settings.h ${InfiniTime_DIR}/src/components/settings/Settings.cpp - ${InfiniTime_DIR}/src/components/ble/NotificationManager.h - ${InfiniTime_DIR}/src/components/ble/NotificationManager.cpp + ${InfiniTime_DIR}/src/components/notifications/NotificationManager.h + ${InfiniTime_DIR}/src/components/notifications/NotificationManager.cpp ${InfiniTime_DIR}/src/components/fs/FS.h ${InfiniTime_DIR}/src/components/fs/FS.cpp ${InfiniTime_DIR}/src/components/motor/MotorController.h diff --git a/main.cpp b/main.cpp index 23ede70..201a788 100644 --- a/main.cpp +++ b/main.cpp @@ -32,7 +32,7 @@ #include "BootloaderVersion.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/brightness/BrightnessController.h" #include "components/motor/MotorController.h" #include "components/datetime/DateTimeController.h" diff --git a/sim/components/ble/AlertNotificationService.cpp b/sim/components/ble/AlertNotificationService.cpp index 0ce00b0..994283b 100644 --- a/sim/components/ble/AlertNotificationService.cpp +++ b/sim/components/ble/AlertNotificationService.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "systemtask/SystemTask.h" using namespace Pinetime::Controllers; diff --git a/sim/components/ble/NimbleController.cpp b/sim/components/ble/NimbleController.cpp index 3684d25..ccb5059 100644 --- a/sim/components/ble/NimbleController.cpp +++ b/sim/components/ble/NimbleController.cpp @@ -15,7 +15,7 @@ //#undef max //#undef min #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/datetime/DateTimeController.h" #include "components/fs/FS.h" #include "systemtask/SystemTask.h" From 5b45475392515aaf032cf1ea1d7c4f045783800e Mon Sep 17 00:00:00 2001 From: minacode Date: Mon, 19 Dec 2022 14:13:19 +0100 Subject: [PATCH 2/2] WIP: update InfiniTime to Refactor Notifications PR --- InfiniTime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InfiniTime b/InfiniTime index b56c5f2..bda9c6b 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit b56c5f25f077d17b23677cdd0d4dc247ce7c421f +Subproject commit bda9c6b98d5e195b4edb50490e6750d73f6fcdac