diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-01-20 21:34:09 +0100 |
commit | 522a1eb0beaabb607b1f123993ec2f09be8a775b (patch) | |
tree | 419bfe41495e6a2e56334db41990ba2fb6d33f16 /src/components/ble/NimbleController.h | |
parent | a0f2fa8469f3a2c0f5f2f914ad174029da321cc0 (diff) |
Merge branch piggz/nav into develop:
- fix conflict
- add a icon for the navigation app.
Diffstat (limited to 'src/components/ble/NimbleController.h')
-rw-r--r-- | src/components/ble/NimbleController.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h index 304182a2..a109800c 100644 --- a/src/components/ble/NimbleController.h +++ b/src/components/ble/NimbleController.h @@ -16,6 +16,7 @@ #include "DfuService.h" #include "ImmediateAlertService.h" #include "MusicService.h" +#include "NavigationService.h" #include "ServiceDiscovery.h" #include "HeartRateService.h" @@ -56,6 +57,7 @@ namespace Pinetime { void StartDiscovery(); Pinetime::Controllers::MusicService& music() {return musicService;}; + Pinetime::Controllers::NavigationService& navigation() {return navService;}; uint16_t connHandle(); @@ -74,6 +76,7 @@ namespace Pinetime { AlertNotificationClient alertNotificationClient; CurrentTimeService currentTimeService; MusicService musicService; + NavigationService navService; BatteryInformationService batteryInformationService; ImmediateAlertService immediateAlertService; HeartRateService heartRateService; |