summaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/ble/MotionService.cpp125
-rw-r--r--src/components/ble/MotionService.h39
-rw-r--r--src/components/ble/NimbleController.cpp9
-rw-r--r--src/components/ble/NimbleController.h5
-rw-r--r--src/components/motion/MotionController.cpp11
-rw-r--r--src/components/motion/MotionController.h3
6 files changed, 3 insertions, 189 deletions
diff --git a/src/components/ble/MotionService.cpp b/src/components/ble/MotionService.cpp
deleted file mode 100644
index 87923c2..0000000
--- a/src/components/ble/MotionService.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include "components/ble/MotionService.h"
-#include "components/motion/MotionController.h"
-#include "systemtask/SystemTask.h"
-#include <nrf_log.h>
-
-using namespace Pinetime::Controllers;
-
-namespace {
- // 0003yyxx-78fc-48fe-8e23-433b3a1942d0
- constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
- return ble_uuid128_t{
- .u = {.type = BLE_UUID_TYPE_128},
- .value = { 0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, x, y, 0x03, 0x00 }
- };
- }
-
- // 00030000-78fc-48fe-8e23-433b3a1942d0
- constexpr ble_uuid128_t BaseUuid() {
- return CharUuid(0x00, 0x00);
- }
-
- constexpr ble_uuid128_t motionServiceUuid {BaseUuid()};
- constexpr ble_uuid128_t stepCountCharUuid {CharUuid(0x01, 0x00)};
- constexpr ble_uuid128_t motionValuesCharUuid {CharUuid(0x02, 0x00)};
-
- int MotionServiceCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
- auto* motionService = static_cast<MotionService*>(arg);
- return motionService->OnStepCountRequested(conn_handle, attr_handle, ctxt);
- }
-}
-
-// TODO Refactoring - remove dependency to SystemTask
-MotionService::MotionService(Pinetime::System::SystemTask& system, Controllers::MotionController& motionController)
- : system {system},
- motionController {motionController},
- characteristicDefinition {{.uuid = &stepCountCharUuid.u,
- .access_cb = MotionServiceCallback,
- .arg = this,
- .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
- .val_handle = &stepCountHandle},
- {.uuid = &motionValuesCharUuid.u,
- .access_cb = MotionServiceCallback,
- .arg = this,
- .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
- .val_handle = &motionValuesHandle},
- {0}},
- serviceDefinition {
- {
- .type = BLE_GATT_SVC_TYPE_PRIMARY,
- .uuid = &motionServiceUuid.u,
- .characteristics = characteristicDefinition
- },
- {0},
- } {
- // TODO refactor to prevent this loop dependency (service depends on controller and controller depends on service)
- motionController.SetService(this);
-}
-
-void MotionService::Init() {
- int res = 0;
- res = ble_gatts_count_cfg(serviceDefinition);
- ASSERT(res == 0);
-
- res = ble_gatts_add_svcs(serviceDefinition);
- ASSERT(res == 0);
-}
-
-int MotionService::OnStepCountRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context) {
- if (attributeHandle == stepCountHandle) {
- NRF_LOG_INFO("Motion-stepcount : handle = %d", stepCountHandle);
- uint32_t buffer = motionController.NbSteps();
-
- int res = os_mbuf_append(context->om, &buffer, 4);
- return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
- } else if(attributeHandle == motionValuesHandle) {
- int16_t buffer[3] = { motionController.X(), motionController.Y(), motionController.Z() };
-
- int res = os_mbuf_append(context->om, buffer, 3 * sizeof(int16_t));
- return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
- }
- return 0;
-}
-
-void MotionService::OnNewStepCountValue(uint32_t stepCount) {
- if(!stepCountNoficationEnabled) return;
-
- uint32_t buffer = stepCount;
- auto* om = ble_hs_mbuf_from_flat(&buffer, 4);
-
- uint16_t connectionHandle = system.nimble().connHandle();
-
- if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
- return;
- }
-
- ble_gattc_notify_custom(connectionHandle, stepCountHandle, om);
-}
-void MotionService::OnNewMotionValues(int16_t x, int16_t y, int16_t z) {
- if(!motionValuesNoficationEnabled) return;
-
- int16_t buffer[3] = { motionController.X(), motionController.Y(), motionController.Z() };
- auto* om = ble_hs_mbuf_from_flat(buffer, 3 * sizeof(int16_t));
-
- uint16_t connectionHandle = system.nimble().connHandle();
-
- if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
- return;
- }
-
- ble_gattc_notify_custom(connectionHandle, motionValuesHandle, om);
-}
-
-void MotionService::SubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle) {
- if(attributeHandle == stepCountHandle)
- stepCountNoficationEnabled = true;
- else if(attributeHandle == motionValuesHandle)
- motionValuesNoficationEnabled = true;
-}
-
-void MotionService::UnsubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle) {
- if(attributeHandle == stepCountHandle)
- stepCountNoficationEnabled = false;
- else if(attributeHandle == motionValuesHandle)
- motionValuesNoficationEnabled = false;
-}
diff --git a/src/components/ble/MotionService.h b/src/components/ble/MotionService.h
deleted file mode 100644
index 1b4ac0a..0000000
--- a/src/components/ble/MotionService.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#define min // workaround: nimble's min/max macros conflict with libstdc++
-#define max
-#include <host/ble_gap.h>
-#include <atomic>
-#undef max
-#undef min
-
-namespace Pinetime {
- namespace System {
- class SystemTask;
- }
- namespace Controllers {
- class MotionController;
- class MotionService {
- public:
- MotionService(Pinetime::System::SystemTask& system, Controllers::MotionController& motionController);
- void Init();
- int OnStepCountRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
- void OnNewStepCountValue(uint32_t stepCount);
- void OnNewMotionValues(int16_t x, int16_t y, int16_t z);
-
- void SubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle);
- void UnsubscribeNotification(uint16_t connectionHandle, uint16_t attributeHandle);
-
- private:
- Pinetime::System::SystemTask& system;
- Controllers::MotionController& motionController;
-
- struct ble_gatt_chr_def characteristicDefinition[3];
- struct ble_gatt_svc_def serviceDefinition[2];
-
- uint16_t stepCountHandle;
- uint16_t motionValuesHandle;
- std::atomic_bool stepCountNoficationEnabled {false};
- std::atomic_bool motionValuesNoficationEnabled {false};
- };
- }
-}
diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp
index a5bc41b..bc712f4 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -28,8 +28,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
NotificationManager& notificationManager,
Battery& batteryController,
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
- HeartRateController& heartRateController,
- MotionController& motionController)
+ HeartRateController& heartRateController
+ )
: systemTask {systemTask},
bleController {bleController},
dateTimeController {dateTimeController},
@@ -44,7 +44,6 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
batteryInformationService {batteryController},
immediateAlertService {systemTask, notificationManager},
heartRateService {systemTask, heartRateController},
- motionService {systemTask, motionController},
serviceDiscovery({&currentTimeClient, &alertNotificationClient}) {
}
@@ -88,7 +87,6 @@ void NimbleController::Init() {
batteryInformationService.Init();
immediateAlertService.Init();
heartRateService.Init();
- motionService.Init();
int rc;
rc = ble_hs_util_ensure_addr(0);
@@ -248,13 +246,10 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
if (event->subscribe.reason == BLE_GAP_SUBSCRIBE_REASON_TERM) {
heartRateService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
- motionService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
} else if (event->subscribe.prev_notify == 0 && event->subscribe.cur_notify == 1) {
heartRateService.SubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
- motionService.SubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
} else if (event->subscribe.prev_notify == 1 && event->subscribe.cur_notify == 0) {
heartRateService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
- motionService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
}
break;
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 263d498..0facca6 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -17,7 +17,6 @@
#include "components/ble/HeartRateService.h"
#include "components/ble/ImmediateAlertService.h"
#include "components/ble/ServiceDiscovery.h"
-#include "components/ble/MotionService.h"
namespace Pinetime {
namespace Drivers {
@@ -42,8 +41,7 @@ namespace Pinetime {
NotificationManager& notificationManager,
Battery& batteryController,
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
- HeartRateController& heartRateController,
- MotionController& motionController);
+ HeartRateController& heartRateController);
void Init();
void StartAdvertising();
int OnGAPEvent(ble_gap_event* event);
@@ -77,7 +75,6 @@ namespace Pinetime {
BatteryInformationService batteryInformationService;
ImmediateAlertService immediateAlertService;
HeartRateService heartRateService;
- MotionService motionService;
ServiceDiscovery serviceDiscovery;
uint8_t addrType;
diff --git a/src/components/motion/MotionController.cpp b/src/components/motion/MotionController.cpp
index 7dd3212..4a7a7eb 100644
--- a/src/components/motion/MotionController.cpp
+++ b/src/components/motion/MotionController.cpp
@@ -3,14 +3,6 @@
using namespace Pinetime::Controllers;
void MotionController::Update(int16_t x, int16_t y, int16_t z, uint32_t nbSteps) {
- if (this->nbSteps != nbSteps && service != nullptr) {
- service->OnNewStepCountValue(nbSteps);
- }
-
- if (service != nullptr && (this->x != x || this->y != y || this->z != z)) {
- service->OnNewMotionValues(x, y, z);
- }
-
this->x = x;
this->y = y;
this->z = z;
@@ -82,6 +74,3 @@ void MotionController::Init(Pinetime::Drivers::Bma421::DeviceTypes types) {
break;
}
}
-void MotionController::SetService(Pinetime::Controllers::MotionService* service) {
- this->service = service;
-}
diff --git a/src/components/motion/MotionController.h b/src/components/motion/MotionController.h
index f80b11b..5385658 100644
--- a/src/components/motion/MotionController.h
+++ b/src/components/motion/MotionController.h
@@ -2,7 +2,6 @@
#include <cstdint>
#include <drivers/Bma421.h>
-#include <components/ble/MotionService.h>
namespace Pinetime {
namespace Controllers {
@@ -49,7 +48,6 @@ namespace Pinetime {
}
void Init(Pinetime::Drivers::Bma421::DeviceTypes types);
- void SetService(Pinetime::Controllers::MotionService* service);
private:
uint32_t nbSteps;
@@ -60,7 +58,6 @@ namespace Pinetime {
int16_t lastYForWakeUp = 0;
bool isSensorOk = false;
DeviceTypes deviceType = DeviceTypes::Unknown;
- Pinetime::Controllers::MotionService* service = nullptr;
int16_t lastXForShake = 0;
int16_t lastYForShake = 0;
generated by cgit v0.10.2 at 2026-01-10 06:31:36 (GMT)