From 7c98f26f1294b7f78156be5682c9633d69ba983d Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Wed, 15 Mar 2023 10:26:12 +0200 Subject: MotionService: Remove SystemTask dependency --- src/components/ble/MotionService.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/components/ble/MotionService.cpp') diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp index 604f22d5..029be894 100644 --- a/src/components/ble/MotionService.cpp +++ b/src/components/ble/MotionService.cpp @@ -1,6 +1,6 @@ #include "components/ble/MotionService.h" #include "components/motion/MotionController.h" -#include "systemtask/SystemTask.h" +#include "components/ble/NimbleController.h" #include using namespace Pinetime::Controllers; @@ -28,8 +28,8 @@ namespace { } // TODO Refactoring - remove dependency to SystemTask -MotionService::MotionService(Pinetime::System::SystemTask& system, Controllers::MotionController& motionController) - : system {system}, +MotionService::MotionService(NimbleController& nimble, Controllers::MotionController& motionController) + : nimble {nimble}, motionController {motionController}, characteristicDefinition {{.uuid = &stepCountCharUuid.u, .access_cb = MotionServiceCallback, @@ -82,7 +82,7 @@ void MotionService::OnNewStepCountValue(uint32_t stepCount) { uint32_t buffer = stepCount; auto* om = ble_hs_mbuf_from_flat(&buffer, 4); - uint16_t connectionHandle = system.nimble().connHandle(); + uint16_t connectionHandle = nimble.connHandle(); if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) { return; @@ -98,7 +98,7 @@ void MotionService::OnNewMotionValues(int16_t x, int16_t y, int16_t z) { int16_t buffer[3] = {x, y, z}; auto* om = ble_hs_mbuf_from_flat(buffer, 3 * sizeof(int16_t)); - uint16_t connectionHandle = system.nimble().connHandle(); + uint16_t connectionHandle = nimble.connHandle(); if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) { return; -- cgit v1.2.3-70-g09d2