From ca5e7d1adfda9426065b182571e8ed1f0b1184e3 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Wed, 15 Mar 2023 10:21:44 +0200 Subject: [PATCH] NavigationService: Remove unused SystemTask ref --- src/components/ble/NavigationService.cpp | 4 +--- src/components/ble/NavigationService.h | 8 +------- src/components/ble/NimbleController.cpp | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/components/ble/NavigationService.cpp b/src/components/ble/NavigationService.cpp index 5508d08c..4922237c 100644 --- a/src/components/ble/NavigationService.cpp +++ b/src/components/ble/NavigationService.cpp @@ -18,8 +18,6 @@ #include "components/ble/NavigationService.h" -#include "systemtask/SystemTask.h" - namespace { // 0001yyxx-78fc-48fe-8e23-433b3a1942d0 constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) { @@ -45,7 +43,7 @@ namespace { } } // namespace -Pinetime::Controllers::NavigationService::NavigationService(Pinetime::System::SystemTask& system) : m_system(system) { +Pinetime::Controllers::NavigationService::NavigationService() { characteristicDefinition[0] = {.uuid = &navFlagCharUuid.u, .access_cb = NAVCallback, .arg = this, diff --git a/src/components/ble/NavigationService.h b/src/components/ble/NavigationService.h index 1c1739ba..03e79ac5 100644 --- a/src/components/ble/NavigationService.h +++ b/src/components/ble/NavigationService.h @@ -27,15 +27,11 @@ #undef min namespace Pinetime { - namespace System { - class SystemTask; - } - namespace Controllers { class NavigationService { public: - explicit NavigationService(Pinetime::System::SystemTask& system); + NavigationService(); void Init(); @@ -57,8 +53,6 @@ namespace Pinetime { std::string m_narrative; std::string m_manDist; int m_progress; - - Pinetime::System::SystemTask& m_system; }; } } diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index 9c88d68c..0d40a9a5 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -44,7 +44,6 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, currentTimeService {dateTimeController}, musicService {*this}, weatherService {dateTimeController}, - navService {systemTask}, batteryInformationService {batteryController}, immediateAlertService {systemTask, notificationManager}, heartRateService {systemTask, heartRateController},