diff options
| author | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 21:09:34 +0200 |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /src/SystemTask/SystemTask.h | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/SystemTask/SystemTask.h')
| -rw-r--r-- | src/SystemTask/SystemTask.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/SystemTask/SystemTask.h b/src/SystemTask/SystemTask.h index ab5f7010..860647a1 100644 --- a/src/SystemTask/SystemTask.h +++ b/src/SystemTask/SystemTask.h @@ -10,6 +10,7 @@ #include <drivers/Watchdog.h> #include <Components/Ble/NimbleController.h> #include <drivers/SpiNorFlash.h> +#include "SystemMonitor.h" namespace Pinetime { namespace System { @@ -65,6 +66,7 @@ namespace Pinetime { static void Process(void* instance); void Work(); + void ReloadIdleTimer() const; bool isBleDiscoveryTimerRunning = false; uint8_t bleDiscoveryTimer = 0; static constexpr uint32_t idleTime = 15000; @@ -72,6 +74,12 @@ namespace Pinetime { bool doNotGoToSleep = false; void GoToRunning(); + +#if configUSE_TRACE_FACILITY == 1 + SystemMonitor<FreeRtosMonitor> monitor; +#else + SystemMonitor<DummyMonitor> monitor; +#endif }; } }
\ No newline at end of file |