summaryrefslogtreecommitdiff
path: root/src/components/ble
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/ble')
-rw-r--r--src/components/ble/HeartRateService.cpp82
-rw-r--r--src/components/ble/HeartRateService.h44
-rw-r--r--src/components/ble/MusicService.cpp88
-rw-r--r--src/components/ble/MusicService.h30
-rw-r--r--src/components/ble/NavigationService.cpp137
-rw-r--r--src/components/ble/NavigationService.h96
-rw-r--r--src/components/ble/NimbleController.cpp9
-rw-r--r--src/components/ble/NimbleController.h8
8 files changed, 450 insertions, 44 deletions
diff --git a/src/components/ble/HeartRateService.cpp b/src/components/ble/HeartRateService.cpp
new file mode 100644
index 00000000..ecd6235d
--- /dev/null
+++ b/src/components/ble/HeartRateService.cpp
@@ -0,0 +1,82 @@
+#include "HeartRateService.h"
+#include "components/heartrate/HeartRateController.h"
+#include "systemtask/SystemTask.h"
+
+using namespace Pinetime::Controllers;
+
+constexpr ble_uuid16_t HeartRateService::heartRateServiceUuid;
+constexpr ble_uuid16_t HeartRateService::heartRateMeasurementUuid;
+
+namespace {
+ int HeartRateServiceServiceCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
+ auto* heartRateService = static_cast<HeartRateService*>(arg);
+ return heartRateService->OnHeartRateRequested(conn_handle, attr_handle, ctxt);
+ }
+}
+
+// TODO Refactoring - remove dependency to SystemTask
+HeartRateService::HeartRateService(Pinetime::System::SystemTask &system, Controllers::HeartRateController& heartRateController) :
+ system{system},
+ heartRateController{heartRateController},
+ characteristicDefinition{
+ {
+ .uuid = (ble_uuid_t *) &heartRateMeasurementUuid,
+ .access_cb = HeartRateServiceServiceCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
+ .val_handle = &heartRateMeasurementHandle
+ },
+ {
+ 0
+ }
+ },
+ serviceDefinition{
+ {
+ /* Device Information Service */
+ .type = BLE_GATT_SVC_TYPE_PRIMARY,
+ .uuid = (ble_uuid_t *) &heartRateServiceUuid,
+ .characteristics = characteristicDefinition
+ },
+ {
+ 0
+ },
+ }{
+ // TODO refactor to prevent this loop dependency (service depends on controller and controller depends on service)
+ heartRateController.SetService(this);
+}
+
+void HeartRateService::Init() {
+ int res = 0;
+ res = ble_gatts_count_cfg(serviceDefinition);
+ ASSERT(res == 0);
+
+ res = ble_gatts_add_svcs(serviceDefinition);
+ ASSERT(res == 0);
+}
+
+int HeartRateService::OnHeartRateRequested(uint16_t connectionHandle, uint16_t attributeHandle,
+ ble_gatt_access_ctxt *context) {
+ if(attributeHandle == heartRateMeasurementHandle) {
+ NRF_LOG_INFO("BATTERY : handle = %d", heartRateMeasurementHandle);
+ static uint8_t batteryValue = heartRateController.HeartRate();
+
+ uint8_t buffer[2] = {0, heartRateController.HeartRate()}; // [0] = flags, [1] = hr value
+
+ int res = os_mbuf_append(context->om, buffer, 2);
+ return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+ }
+ return 0;
+}
+
+void HeartRateService::OnNewHeartRateValue(uint8_t heartRateValue) {
+ uint8_t buffer[2] = {0, heartRateController.HeartRate()}; // [0] = flags, [1] = hr value
+ auto *om = ble_hs_mbuf_from_flat(buffer, 2);
+
+ uint16_t connectionHandle = system.nimble().connHandle();
+
+ if (connectionHandle == 0 || connectionHandle == BLE_HS_CONN_HANDLE_NONE) {
+ return;
+ }
+
+ ble_gattc_notify_custom(connectionHandle, heartRateMeasurementHandle, om);
+}
diff --git a/src/components/ble/HeartRateService.h b/src/components/ble/HeartRateService.h
new file mode 100644
index 00000000..835e2941
--- /dev/null
+++ b/src/components/ble/HeartRateService.h
@@ -0,0 +1,44 @@
+#pragma once
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <host/ble_gap.h>
+#undef max
+#undef min
+
+namespace Pinetime {
+ namespace System {
+ class SystemTask;
+ }
+ namespace Controllers {
+ class HeartRateController;
+ class HeartRateService {
+ public:
+ HeartRateService(Pinetime::System::SystemTask &system, Controllers::HeartRateController& heartRateController);
+ void Init();
+ int OnHeartRateRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt *context);
+ void OnNewHeartRateValue(uint8_t hearRateValue);
+
+ private:
+ Pinetime::System::SystemTask &system;
+ Controllers::HeartRateController& heartRateController;
+ static constexpr uint16_t heartRateServiceId {0x180D};
+ static constexpr uint16_t heartRateMeasurementId {0x2A37};
+
+ static constexpr ble_uuid16_t heartRateServiceUuid {
+ .u {.type = BLE_UUID_TYPE_16},
+ .value = heartRateServiceId
+ };
+
+ static constexpr ble_uuid16_t heartRateMeasurementUuid {
+ .u {.type = BLE_UUID_TYPE_16},
+ .value = heartRateMeasurementId
+ };
+
+ struct ble_gatt_chr_def characteristicDefinition[3];
+ struct ble_gatt_svc_def serviceDefinition[2];
+
+ uint16_t heartRateMeasurementHandle;
+
+ };
+ }
+}
diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp
index fdecb6b3..bd6e27fb 100644
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@@ -24,32 +24,68 @@ int MSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
}
Pinetime::Controllers::MusicService::MusicService(Pinetime::System::SystemTask &system) : m_system(system) {
- msUuid.value[11] = msId[0];
- msUuid.value[12] = msId[1];
- msEventCharUuid.value[11] = msEventCharId[0];
- msEventCharUuid.value[12] = msEventCharId[1];
- msStatusCharUuid.value[11] = msStatusCharId[0];
- msStatusCharUuid.value[12] = msStatusCharId[1];
- msTrackCharUuid.value[11] = msTrackCharId[0];
- msTrackCharUuid.value[12] = msTrackCharId[1];
- msArtistCharUuid.value[11] = msArtistCharId[0];
- msArtistCharUuid.value[12] = msArtistCharId[1];
- msAlbumCharUuid.value[11] = msAlbumCharId[0];
- msAlbumCharUuid.value[12] = msAlbumCharId[1];
- msPositionCharUuid.value[11] = msPositionCharId[0];
- msPositionCharUuid.value[12] = msPositionCharId[1];
- msTotalLengthCharUuid.value[11] = msTotalLengthCharId[0];
- msTotalLengthCharUuid.value[12] = msTotalLengthCharId[1];
- msTrackNumberCharUuid.value[11] = msTrackNumberCharId[0];
- msTrackNumberCharUuid.value[12] = msTrackNumberCharId[1];
- msTrackTotalCharUuid.value[11] = msTrackTotalCharId[0];
- msTrackTotalCharUuid.value[12] = msTrackTotalCharId[1];
- msPlaybackSpeedCharUuid.value[11] = msPlaybackSpeedCharId[0];
- msPlaybackSpeedCharUuid.value[12] = msPlaybackSpeedCharId[1];
- msRepeatCharUuid.value[11] = msRepeatCharId[0];
- msRepeatCharUuid.value[12] = msRepeatCharId[1];
- msShuffleCharUuid.value[11] = msShuffleCharId[0];
- msShuffleCharUuid.value[12] = msShuffleCharId[1];
+ msUuid.value[14] = msId[0];
+ msUuid.value[15] = msId[1];
+
+ msEventCharUuid.value[12] = msEventCharId[0];
+ msEventCharUuid.value[13] = msEventCharId[1];
+ msEventCharUuid.value[14] = msId[0];
+ msEventCharUuid.value[15] = msId[1];
+
+ msStatusCharUuid.value[12] = msStatusCharId[0];
+ msStatusCharUuid.value[13] = msStatusCharId[1];
+ msStatusCharUuid.value[14] = msId[0];
+ msStatusCharUuid.value[15] = msId[1];
+
+ msTrackCharUuid.value[12] = msTrackCharId[0];
+ msTrackCharUuid.value[13] = msTrackCharId[1];
+ msTrackCharUuid.value[14] = msId[0];
+ msTrackCharUuid.value[15] = msId[1];
+
+ msArtistCharUuid.value[12] = msArtistCharId[0];
+ msArtistCharUuid.value[13] = msArtistCharId[1];
+ msArtistCharUuid.value[14] = msId[0];
+ msArtistCharUuid.value[15] = msId[1];
+
+ msAlbumCharUuid.value[12] = msAlbumCharId[0];
+ msAlbumCharUuid.value[13] = msAlbumCharId[1];
+ msAlbumCharUuid.value[14] = msId[0];
+ msAlbumCharUuid.value[15] = msId[1];
+
+ msPositionCharUuid.value[12] = msPositionCharId[0];
+ msPositionCharUuid.value[13] = msPositionCharId[1];
+ msPositionCharUuid.value[14] = msId[0];
+ msPositionCharUuid.value[15] = msId[1];
+
+ msTotalLengthCharUuid.value[12] = msTotalLengthCharId[0];
+ msTotalLengthCharUuid.value[13] = msTotalLengthCharId[1];
+ msTotalLengthCharUuid.value[14] = msId[0];
+ msTotalLengthCharUuid.value[15] = msId[1];
+
+ msTrackNumberCharUuid.value[12] = msTrackNumberCharId[0];
+ msTrackNumberCharUuid.value[13] = msTrackNumberCharId[1];
+ msTrackNumberCharUuid.value[14] = msId[0];
+ msTrackNumberCharUuid.value[15] = msId[1];
+
+ msTrackTotalCharUuid.value[12] = msTrackTotalCharId[0];
+ msTrackTotalCharUuid.value[13] = msTrackTotalCharId[1];
+ msTrackTotalCharUuid.value[14] = msId[0];
+ msTrackTotalCharUuid.value[15] = msId[1];
+
+ msPlaybackSpeedCharUuid.value[12] = msPlaybackSpeedCharId[0];
+ msPlaybackSpeedCharUuid.value[13] = msPlaybackSpeedCharId[1];
+ msPlaybackSpeedCharUuid.value[14] = msId[0];
+ msPlaybackSpeedCharUuid.value[15] = msId[1];
+
+ msRepeatCharUuid.value[12] = msRepeatCharId[0];
+ msRepeatCharUuid.value[13] = msRepeatCharId[1];
+ msRepeatCharUuid.value[14] = msId[0];
+ msRepeatCharUuid.value[15] = msId[1];
+
+ msShuffleCharUuid.value[12] = msShuffleCharId[0];
+ msShuffleCharUuid.value[13] = msShuffleCharId[1];
+ msShuffleCharUuid.value[14] = msId[0];
+ msShuffleCharUuid.value[15] = msId[1];
characteristicDefinition[0] = {.uuid = (ble_uuid_t *) (&msEventCharUuid),
.access_cb = MSCallback,
diff --git a/src/components/ble/MusicService.h b/src/components/ble/MusicService.h
index ee3628b0..172ab61c 100644
--- a/src/components/ble/MusicService.h
+++ b/src/components/ble/MusicService.h
@@ -26,8 +26,8 @@
#undef max
#undef min
-//c7e50000-78fc-48fe-8e23-43b37a1942d0
-#define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7}
+//00000000-78fc-48fe-8e23-433b3a1942d0
+#define MUSIC_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0x00, 0x00}
namespace Pinetime {
namespace System {
@@ -73,19 +73,19 @@ namespace Pinetime {
Playing = 0x01
};
private:
- static constexpr uint8_t msId[2] = {0x00, 0x01};
- static constexpr uint8_t msEventCharId[2] = {0x00, 0x02};
- static constexpr uint8_t msStatusCharId[2] = {0x00, 0x03};
- static constexpr uint8_t msArtistCharId[2] = {0x00, 0x04};
- static constexpr uint8_t msTrackCharId[2] = {0x00, 0x05};
- static constexpr uint8_t msAlbumCharId[2] = {0x00, 0x06};
- static constexpr uint8_t msPositionCharId[2] = {0x00, 0x07};
- static constexpr uint8_t msTotalLengthCharId[2] = {0x00, 0x08};
- static constexpr uint8_t msTrackNumberCharId[2] = {0x00, 0x09};
- static constexpr uint8_t msTrackTotalCharId[2] = {0x00, 0x0a};
- static constexpr uint8_t msPlaybackSpeedCharId[2] = {0x00, 0x0b};
- static constexpr uint8_t msRepeatCharId[2] = {0x00, 0x0c};
- static constexpr uint8_t msShuffleCharId[2] = {0x00, 0x0d};
+ static constexpr uint8_t msId[2] = {0x00, 0x00};
+ static constexpr uint8_t msEventCharId[2] = {0x01, 0x00};
+ static constexpr uint8_t msStatusCharId[2] = {0x02, 0x00};
+ static constexpr uint8_t msArtistCharId[2] = {0x03, 0x00};
+ static constexpr uint8_t msTrackCharId[2] = {0x04, 0x00};
+ static constexpr uint8_t msAlbumCharId[2] = {0x05, 0x00};
+ static constexpr uint8_t msPositionCharId[2] = {0x06, 0x00};
+ static constexpr uint8_t msTotalLengthCharId[2] = {0x07, 0x00};
+ static constexpr uint8_t msTrackNumberCharId[2] = {0x08, 0x00};
+ static constexpr uint8_t msTrackTotalCharId[2] = {0x09, 0x00};
+ static constexpr uint8_t msPlaybackSpeedCharId[2] = {0x0a, 0x00};
+ static constexpr uint8_t msRepeatCharId[2] = {0x0b, 0x00};
+ static constexpr uint8_t msShuffleCharId[2] = {0x0c, 0x00};
ble_uuid128_t msUuid{
.u = {.type = BLE_UUID_TYPE_128},
diff --git a/src/components/ble/NavigationService.cpp b/src/components/ble/NavigationService.cpp
new file mode 100644
index 00000000..3c1fd162
--- /dev/null
+++ b/src/components/ble/NavigationService.cpp
@@ -0,0 +1,137 @@
+/* Copyright (C) 2021 Adam Pigg
+
+ This file is part of InfiniTime.
+
+ InfiniTime is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ InfiniTime is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "NavigationService.h"
+
+#include "systemtask/SystemTask.h"
+
+int NAVCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
+ auto navService = static_cast<Pinetime::Controllers::NavigationService *>(arg);
+ return navService->OnCommand(conn_handle, attr_handle, ctxt);
+}
+
+Pinetime::Controllers::NavigationService::NavigationService(Pinetime::System::SystemTask &system) : m_system(system) {
+ navUuid.value[14] = navId[0];
+ navUuid.value[15] = navId[1];
+
+ navFlagCharUuid.value[12] = navFlagCharId[0];
+ navFlagCharUuid.value[13] = navFlagCharId[1];
+ navFlagCharUuid.value[14] = navId[0];
+ navFlagCharUuid.value[15] = navId[1];
+
+ navNarrativeCharUuid.value[12] = navNarrativeCharId[0];
+ navNarrativeCharUuid.value[13] = navNarrativeCharId[1];
+ navNarrativeCharUuid.value[14] = navId[0];
+ navNarrativeCharUuid.value[15] = navId[1];
+
+ navManDistCharUuid.value[12] = navManDistCharId[0];
+ navManDistCharUuid.value[13] = navManDistCharId[1];
+ navManDistCharUuid.value[14] = navId[0];
+ navManDistCharUuid.value[15] = navId[1];
+
+ navProgressCharUuid.value[12] = navProgressCharId[0];
+ navProgressCharUuid.value[13] = navProgressCharId[1];
+ navProgressCharUuid.value[14] = navId[0];
+ navProgressCharUuid.value[15] = navId[1];
+
+ characteristicDefinition[0] = {.uuid = (ble_uuid_t *) (&navFlagCharUuid),
+ .access_cb = NAVCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+ };
+
+ characteristicDefinition[1] = {.uuid = (ble_uuid_t *) (&navNarrativeCharUuid),
+ .access_cb = NAVCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+ };
+ characteristicDefinition[2] = {.uuid = (ble_uuid_t *) (&navManDistCharUuid),
+ .access_cb = NAVCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+ };
+ characteristicDefinition[3] = {.uuid = (ble_uuid_t *) (&navProgressCharUuid),
+ .access_cb = NAVCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+ };
+
+ characteristicDefinition[4] = {0};
+
+ serviceDefinition[0] = {
+ .type = BLE_GATT_SVC_TYPE_PRIMARY,
+ .uuid = (ble_uuid_t *) &navUuid,
+ .characteristics = characteristicDefinition
+ };
+ serviceDefinition[1] = {0};
+
+ m_progress = 0;
+}
+
+void Pinetime::Controllers::NavigationService::Init() {
+ int res = 0;
+ res = ble_gatts_count_cfg(serviceDefinition);
+ ASSERT(res == 0);
+
+ res = ble_gatts_add_svcs(serviceDefinition);
+ ASSERT(res == 0);
+}
+
+int Pinetime::Controllers::NavigationService::OnCommand(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt) {
+
+ if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
+ size_t notifSize = OS_MBUF_PKTLEN(ctxt->om);
+ uint8_t data[notifSize + 1];
+ data[notifSize] = '\0';
+ os_mbuf_copydata(ctxt->om, 0, notifSize, data);
+ char *s = (char *) &data[0];
+ NRF_LOG_INFO("DATA : %s", s);
+ if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navFlagCharUuid) == 0) {
+ m_flag = s;
+ } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navNarrativeCharUuid) == 0) {
+ m_narrative = s;
+ } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navManDistCharUuid) == 0) {
+ m_manDist = s;
+ } else if (ble_uuid_cmp(ctxt->chr->uuid, (ble_uuid_t *) &navProgressCharUuid) == 0) {
+ m_progress = data[0];
+ }
+ }
+ return 0;
+}
+
+std::string Pinetime::Controllers::NavigationService::getFlag()
+{
+ return m_flag;
+}
+
+std::string Pinetime::Controllers::NavigationService::getNarrative()
+{
+ return m_narrative;
+}
+
+std::string Pinetime::Controllers::NavigationService::getManDist()
+{
+ return m_manDist;
+}
+
+int Pinetime::Controllers::NavigationService::getProgress()
+{
+ return m_progress;
+}
+
diff --git a/src/components/ble/NavigationService.h b/src/components/ble/NavigationService.h
new file mode 100644
index 00000000..29b17582
--- /dev/null
+++ b/src/components/ble/NavigationService.h
@@ -0,0 +1,96 @@
+/* Copyright (C) 2021 Adam Pigg
+
+ This file is part of InfiniTime.
+
+ InfiniTime is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ InfiniTime is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include <cstdint>
+#include <string>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
+#include <host/ble_gap.h>
+#include <host/ble_uuid.h>
+#undef max
+#undef min
+
+//c7e60000-78fc-48fe-8e23-433b3a1942d0
+#define NAVIGATION_SERVICE_UUID_BASE {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0x00, 0x00}
+
+namespace Pinetime {
+ namespace System {
+ class SystemTask;
+ }
+ namespace Controllers {
+
+ class NavigationService {
+ public:
+ explicit NavigationService(Pinetime::System::SystemTask &system);
+
+ void Init();
+
+ int OnCommand(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt);
+
+ std::string getFlag();
+
+ std::string getNarrative();
+
+ std::string getManDist();
+
+ int getProgress();
+
+ private:
+ static constexpr uint8_t navId[2] = {0x01, 0x00};
+ static constexpr uint8_t navFlagCharId[2] = {0x01, 0x00};
+ static constexpr uint8_t navNarrativeCharId[2] = {0x02, 0x00};
+ static constexpr uint8_t navManDistCharId[2] = {0x03, 0x00};
+ static constexpr uint8_t navProgressCharId[2] = {0x04, 0x00};
+
+ ble_uuid128_t navUuid{
+ .u = {.type = BLE_UUID_TYPE_128},
+ .value = NAVIGATION_SERVICE_UUID_BASE
+ };
+
+ ble_uuid128_t navFlagCharUuid{
+ .u = {.type = BLE_UUID_TYPE_128},
+ .value = NAVIGATION_SERVICE_UUID_BASE
+ };
+ ble_uuid128_t navNarrativeCharUuid{
+ .u = {.type = BLE_UUID_TYPE_128},
+ .value = NAVIGATION_SERVICE_UUID_BASE
+ };
+ ble_uuid128_t navManDistCharUuid{
+ .u = {.type = BLE_UUID_TYPE_128},
+ .value = NAVIGATION_SERVICE_UUID_BASE
+ };
+ ble_uuid128_t navProgressCharUuid{
+ .u = {.type = BLE_UUID_TYPE_128},
+ .value = NAVIGATION_SERVICE_UUID_BASE
+ };
+
+ struct ble_gatt_chr_def characteristicDefinition[5];
+ struct ble_gatt_svc_def serviceDefinition[2];
+
+ std::string m_flag;
+ 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 a6f3cc39..f2786ea1 100644
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@@ -22,7 +22,8 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
DateTime& dateTimeController,
Pinetime::Controllers::NotificationManager& notificationManager,
Controllers::Battery& batteryController,
- Pinetime::Drivers::SpiNorFlash& spiNorFlash) :
+ Pinetime::Drivers::SpiNorFlash& spiNorFlash,
+ Controllers::HeartRateController& heartRateController) :
systemTask{systemTask},
bleController{bleController},
dateTimeController{dateTimeController},
@@ -34,9 +35,11 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
alertNotificationClient{systemTask, notificationManager},
currentTimeService{dateTimeController},
musicService{systemTask},
+ navService{systemTask},
batteryInformationService{batteryController},
immediateAlertService{systemTask, notificationManager},
- serviceDiscovery({&currentTimeClient, &alertNotificationClient}) {
+ serviceDiscovery({&currentTimeClient, &alertNotificationClient}),
+ heartRateService{systemTask, heartRateController} {
}
int GAPEventCallback(struct ble_gap_event *event, void *arg) {
@@ -54,10 +57,12 @@ void NimbleController::Init() {
currentTimeClient.Init();
currentTimeService.Init();
musicService.Init();
+ navService.Init();
anService.Init();
dfuService.Init();
batteryInformationService.Init();
immediateAlertService.Init();
+ heartRateService.Init();
int res;
res = ble_hs_util_ensure_addr(0);
ASSERT(res == 0);
diff --git a/src/components/ble/NimbleController.h b/src/components/ble/NimbleController.h
index 914f11e6..a109800c 100644
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@@ -16,7 +16,9 @@
#include "DfuService.h"
#include "ImmediateAlertService.h"
#include "MusicService.h"
+#include "NavigationService.h"
#include "ServiceDiscovery.h"
+#include "HeartRateService.h"
namespace Pinetime {
namespace Drivers {
@@ -37,7 +39,8 @@ namespace Pinetime {
public:
NimbleController(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::Ble& bleController,
DateTime& dateTimeController, Pinetime::Controllers::NotificationManager& notificationManager,
- Controllers::Battery& batteryController, Pinetime::Drivers::SpiNorFlash& spiNorFlash);
+ Controllers::Battery& batteryController, Pinetime::Drivers::SpiNorFlash& spiNorFlash,
+ Controllers::HeartRateController& heartRateController);
void Init();
void StartAdvertising();
int OnGAPEvent(ble_gap_event *event);
@@ -54,6 +57,7 @@ namespace Pinetime {
void StartDiscovery();
Pinetime::Controllers::MusicService& music() {return musicService;};
+ Pinetime::Controllers::NavigationService& navigation() {return navService;};
uint16_t connHandle();
@@ -72,8 +76,10 @@ namespace Pinetime {
AlertNotificationClient alertNotificationClient;
CurrentTimeService currentTimeService;
MusicService musicService;
+ NavigationService navService;
BatteryInformationService batteryInformationService;
ImmediateAlertService immediateAlertService;
+ HeartRateService heartRateService;
uint8_t addrType; // 1 = Random, 0 = PUBLIC
uint16_t connectionHandle = 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 19:18:13 +0000