will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SystemTask: forward declare BatteryController to fix of cyclic dependency

Browse Source 
SystemTask.h included BatteryController.h, and BatteryController.h
included SystemTask.h. If unlucky the class SystemTask isn't created yet
when BatteryController wants to use it.

Fix that cyclic dependency by forward declaring the BatteryController
class and including it in the SystemTask.cpp file, where it is needed.
This commit is contained in:
Reinhold Gschweicher 2022-02-15 23:59:38 +01:00 committed by JF
parent 4aaa3a3b49
commit b857fdb9f4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/systemtask/SystemTask.cpp
View File

@ -4,6 +4,7 @@
#include <libraries/log/nrf_log.h> #include <libraries/log/nrf_log.h>
#include "BootloaderVersion.h" #include "BootloaderVersion.h"
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h" #include "components/ble/BleController.h"
#include "drivers/Cst816s.h" #include "drivers/Cst816s.h"
#include "drivers/St7789.h" #include "drivers/St7789.h"

2
src/systemtask/SystemTask.h
View File

@ -13,7 +13,6 @@
#include <components/motion/MotionController.h> #include <components/motion/MotionController.h>
#include "systemtask/SystemMonitor.h" #include "systemtask/SystemMonitor.h"
#include "components/battery/BatteryController.h"
#include "components/ble/NimbleController.h" #include "components/ble/NimbleController.h"
#include "components/ble/NotificationManager.h" #include "components/ble/NotificationManager.h"
#include "components/motor/MotorController.h" #include "components/motor/MotorController.h"
@ -47,6 +46,7 @@ namespace Pinetime {
class Hrs3300; class Hrs3300;
} }
namespace Controllers { namespace Controllers {
class Battery;
class TouchHandler; class TouchHandler;
class ButtonHandler; class ButtonHandler;
} }