From 522a1eb0beaabb607b1f123993ec2f09be8a775b Mon Sep 17 00:00:00 2001
From: Jean-François Milants <jf@codingfield.com>
Date: Wed, 20 Jan 2021 21:34:09 +0100
Subject: Merge branch piggz/nav into develop:  - fix conflict  - add a icon
 for the navigation app.

---
 src/components/ble/NimbleController.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components/ble/NimbleController.cpp')

diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index 608e230e..f2786ea1 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -35,6 +35,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
         alertNotificationClient{systemTask, notificationManager},
         currentTimeService{dateTimeController},
         musicService{systemTask},
+        navService{systemTask},
         batteryInformationService{batteryController},
         immediateAlertService{systemTask, notificationManager},
         serviceDiscovery({&currentTimeClient, &alertNotificationClient}),
@@ -56,6 +57,7 @@ void NimbleController::Init() {
   currentTimeClient.Init();
   currentTimeService.Init();
   musicService.Init();
+  navService.Init();
   anService.Init();
   dfuService.Init();
   batteryInformationService.Init();
-- 
cgit v1.2.3-70-g09d2