Merge branch 'develop' into patch-2

2 files changed, 6 insertions, 2 deletions

diff --git a/src/SystemTask/SystemTask.cpp b/src/SystemTask/SystemTask.cpp
index 8f565860..9f57f6f6 100644
--- a/src/SystemTask/SystemTask.cpp
+++ b/src/SystemTask/SystemTask.cpp
@@ -12,6 +12,7 @@
 #include <host/util/util.h>
 #include <drivers/InternalFlash.h>
 #include "../main.h"
+#include "Components/Ble/NimbleController.h"
 
 using namespace Pinetime::System;
 
diff --git a/src/SystemTask/SystemTask.h b/src/SystemTask/SystemTask.h
index 8fa7e7d1..3e53baed 100644
--- a/src/SystemTask/SystemTask.h
+++ b/src/SystemTask/SystemTask.h
@@ -8,9 +8,10 @@
 #include <Components/Battery/BatteryController.h>
 #include <DisplayApp/DisplayApp.h>
 #include <drivers/Watchdog.h>
-#include <Components/Ble/NimbleController.h>
 #include <drivers/SpiNorFlash.h>
 #include "SystemMonitor.h"
+#include "Components/Ble/NimbleController.h"
+#include "timers.h"
 
 namespace Pinetime {
   namespace System {
@@ -37,6 +38,8 @@ namespace Pinetime {
 
         void OnIdle();
 
+        Pinetime::Controllers::NimbleController& nimble() {return nimbleController;};
+
       private:
         TaskHandle_t taskHandle;
 
@@ -84,4 +87,4 @@ namespace Pinetime {
 #endif
     };
   }
-}
\ No newline at end of file
+}