scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

MotionService: Remove SystemTask dependency

Browse source
This commit is contained in:
Riku Isokoski 2023-03-15 10:26:12 +02:00
parent ca5e7d1adf
commit 7c98f26f12
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/ble/MotionService.cpp
View file

@ -1,6 +1,6 @@
#include "components/ble/MotionService.h"
#include "components/motion/MotionController.h"
#include "systemtask/SystemTask.h"
#include "components/ble/NimbleController.h"
#include <nrf_log.h>
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;