summaryrefslogtreecommitdiff
path: root/src/Components
diff options
context:
space:
mode:
Diffstat (limited to 'src/Components')
-rw-r--r--src/Components/Ble/AlertNotificationService.cpp73
-rw-r--r--src/Components/Ble/AlertNotificationService.h39
-rw-r--r--src/Components/Ble/CurrentTimeClient.cpp82
-rw-r--r--src/Components/Ble/CurrentTimeClient.h85
-rw-r--r--src/Components/Ble/CurrentTimeService.cpp83
-rw-r--r--src/Components/Ble/CurrentTimeService.h48
-rw-r--r--src/Components/Ble/NimbleController.cpp16
-rw-r--r--src/Components/Ble/NimbleController.h5
8 files changed, 348 insertions, 83 deletions
diff --git a/src/Components/Ble/AlertNotificationService.cpp b/src/Components/Ble/AlertNotificationService.cpp
new file mode 100644
index 00000000..8e3b712d
--- /dev/null
+++ b/src/Components/Ble/AlertNotificationService.cpp
@@ -0,0 +1,73 @@
+
+#include <hal/nrf_rtc.h>
+#include "NotificationManager.h"
+#include <SystemTask/SystemTask.h>
+
+#include "AlertNotificationService.h"
+
+using namespace Pinetime::Controllers;
+
+constexpr ble_uuid16_t AlertNotificationService::ansUuid;
+constexpr ble_uuid16_t AlertNotificationService::ansCharUuid;
+
+
+int AlertNotificationCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
+ auto anService = static_cast<AlertNotificationService*>(arg);
+ return anService->OnAlert(conn_handle, attr_handle, ctxt);
+}
+
+void AlertNotificationService::Init() {
+ ble_gatts_count_cfg(serviceDefinition);
+ ble_gatts_add_svcs(serviceDefinition);
+}
+
+AlertNotificationService::AlertNotificationService ( Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::NotificationManager& notificationManager ) : m_systemTask{systemTask}, m_notificationManager{notificationManager},
+ characteristicDefinition{
+ {
+ .uuid = (ble_uuid_t *) &ansCharUuid,
+ .access_cb = AlertNotificationCallback,
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE
+ },
+ {
+ 0
+ }
+ },
+ serviceDefinition{
+ {
+ /* Device Information Service */
+ .type = BLE_GATT_SVC_TYPE_PRIMARY,
+ .uuid = (ble_uuid_t *) &ansUuid,
+ .characteristics = characteristicDefinition
+ },
+ {
+ 0
+ },
+ }
+{
+}
+
+int AlertNotificationService::OnAlert(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[3];
+ NRF_LOG_INFO("DATA : %s", s);
+
+ for(int i = 0; i <= notifSize; i++)
+ {
+ if(s[i] == 0x00)
+ {
+ s[i] = 0x0A;
+ }
+ }
+
+ m_notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, s, notifSize + 1);
+ m_systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
+ }
+ return 0;
+}
diff --git a/src/Components/Ble/AlertNotificationService.h b/src/Components/Ble/AlertNotificationService.h
new file mode 100644
index 00000000..53cb44cc
--- /dev/null
+++ b/src/Components/Ble/AlertNotificationService.h
@@ -0,0 +1,39 @@
+#pragma once
+#include <cstdint>
+#include <array>
+#include <host/ble_gap.h>
+
+namespace Pinetime {
+ namespace Controllers {
+ class AlertNotificationService {
+ public:
+ AlertNotificationService(Pinetime::System::SystemTask &systemTask,
+ Pinetime::Controllers::NotificationManager &notificationManager);
+ void Init();
+
+ int OnAlert(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt);
+
+
+ private:
+ static constexpr uint16_t ansId {0x1811};
+ static constexpr uint16_t ansCharId {0x2a46};
+
+ static constexpr ble_uuid16_t ansUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = ansId
+ };
+
+ static constexpr ble_uuid16_t ansCharUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = ansCharId
+ };
+
+ struct ble_gatt_chr_def characteristicDefinition[2];
+ struct ble_gatt_svc_def serviceDefinition[2];
+
+ Pinetime::System::SystemTask &m_systemTask;
+ NotificationManager &m_notificationManager;
+ };
+ }
+}
diff --git a/src/Components/Ble/CurrentTimeClient.cpp b/src/Components/Ble/CurrentTimeClient.cpp
index caec39d1..7a225f4b 100644
--- a/src/Components/Ble/CurrentTimeClient.cpp
+++ b/src/Components/Ble/CurrentTimeClient.cpp
@@ -10,64 +10,68 @@ CurrentTimeClient::CurrentTimeClient(DateTime& dateTimeController) : dateTimeCon
}
+void CurrentTimeClient::Init() {
+
+}
+
bool CurrentTimeClient::OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service) {
- if(service == nullptr && error->status == BLE_HS_EDONE) {
- NRF_LOG_INFO("CTS Discovery complete");
- return true;
- }
+ if(service == nullptr && error->status == BLE_HS_EDONE) {
+ NRF_LOG_INFO("CTS Discovery complete");
+ return true;
+ }
- if(service != nullptr && ble_uuid_cmp(((ble_uuid_t*)&ctsServiceUuid), &service->uuid.u) == 0) {
- NRF_LOG_INFO("CTS discovered : 0x%x", service->start_handle);
- isDiscovered = true;
- ctsStartHandle = service->start_handle;
- ctsEndHandle = service->end_handle;
+ if(service != nullptr && ble_uuid_cmp(((ble_uuid_t*)&ctsServiceUuid), &service->uuid.u) == 0) {
+ NRF_LOG_INFO("CTS discovered : 0x%x", service->start_handle);
+ isDiscovered = true;
+ ctsStartHandle = service->start_handle;
+ ctsEndHandle = service->end_handle;
+ return false;
+ }
return false;
- }
- return false;
}
int CurrentTimeClient::OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error *error,
- const ble_gatt_chr *characteristic) {
- if(characteristic == nullptr && error->status == BLE_HS_EDONE) {
- NRF_LOG_INFO("CTS Characteristic discovery complete");
- return 0;
- }
+ const ble_gatt_chr *characteristic) {
+ if(characteristic == nullptr && error->status == BLE_HS_EDONE) {
+ NRF_LOG_INFO("CTS Characteristic discovery complete");
+ return 0;
+ }
- if(characteristic != nullptr && ble_uuid_cmp(((ble_uuid_t*)&currentTimeCharacteristicUuid), &characteristic->uuid.u) == 0) {
- NRF_LOG_INFO("CTS Characteristic discovered : 0x%x", characteristic->val_handle);
- currentTimeHandle = characteristic->val_handle;
- }
- return 0;
+ if(characteristic != nullptr && ble_uuid_cmp(((ble_uuid_t*)&currentTimeCharacteristicUuid), &characteristic->uuid.u) == 0) {
+ NRF_LOG_INFO("CTS Characteristic discovered : 0x%x", characteristic->val_handle);
+ currentTimeHandle = characteristic->val_handle;
+ }
+ return 0;
}
int CurrentTimeClient::OnCurrentTimeReadResult(uint16_t conn_handle, const ble_gatt_error *error, const ble_gatt_attr *attribute) {
- if(error->status == 0) {
- // TODO check that attribute->handle equals the handle discovered in OnCharacteristicDiscoveryEvent
- CtsData result;
- os_mbuf_copydata(attribute->om, 0, sizeof(CtsData), &result);
- NRF_LOG_INFO("Received data: %d-%d-%d %d:%d:%d", result.year,
- result.month, result.dayofmonth,
- result.hour, result.minute, result.second);
- dateTimeController.SetTime(result.year, result.month, result.dayofmonth,
- 0, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG));
- } else {
- NRF_LOG_INFO("Error retrieving current time: %d", error->status);
- }
- return 0;
+ if(error->status == 0) {
+ // TODO check that attribute->handle equals the handle discovered in OnCharacteristicDiscoveryEvent
+ CtsData result;
+ os_mbuf_copydata(attribute->om, 0, sizeof(CtsData), &result);
+ NRF_LOG_INFO("Received data: %d-%d-%d %d:%d:%d", result.year,
+ result.month, result.dayofmonth,
+ result.hour, result.minute, result.second);
+ dateTimeController.SetTime(result.year, result.month, result.dayofmonth,
+ 0, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG));
+ } else {
+ NRF_LOG_INFO("Error retrieving current time: %d", error->status);
+ }
+ return 0;
}
bool CurrentTimeClient::IsDiscovered() const {
- return isDiscovered;
+ return isDiscovered;
}
uint16_t CurrentTimeClient::StartHandle() const {
- return ctsStartHandle;
+ return ctsStartHandle;
}
uint16_t CurrentTimeClient::EndHandle() const {
- return ctsEndHandle;
+ return ctsEndHandle;
}
uint16_t CurrentTimeClient::CurrentTimeHandle() const {
- return currentTimeHandle;
-}
+ return currentTimeHandle;
+} \ No newline at end of file
diff --git a/src/Components/Ble/CurrentTimeClient.h b/src/Components/Ble/CurrentTimeClient.h
index 76caff9f..fabcdaca 100644
--- a/src/Components/Ble/CurrentTimeClient.h
+++ b/src/Components/Ble/CurrentTimeClient.h
@@ -5,50 +5,51 @@
#include <host/ble_gap.h>
namespace Pinetime {
- namespace Controllers {
+ namespace Controllers {
- class CurrentTimeClient {
- public:
- explicit CurrentTimeClient(DateTime& dateTimeController);
- bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service);
- int OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error *error,
- const ble_gatt_chr *characteristic);
- int OnCurrentTimeReadResult(uint16_t conn_handle, const ble_gatt_error *error, const ble_gatt_attr *attribute);
- bool IsDiscovered() const;
- uint16_t StartHandle() const;
- uint16_t EndHandle() const;
- uint16_t CurrentTimeHandle() const;
- static constexpr const ble_uuid16_t* Uuid() { return &CurrentTimeClient::ctsServiceUuid; }
- static constexpr const ble_uuid16_t* CurrentTimeCharacteristicUuid() { return &CurrentTimeClient::currentTimeCharacteristicUuid; }
- private:
- typedef struct __attribute__((packed)) {
- uint16_t year;
- uint8_t month;
- uint8_t dayofmonth;
- uint8_t hour;
- uint8_t minute;
- uint8_t second;
- uint8_t millis;
- uint8_t reason;
- } CtsData;
+ class CurrentTimeClient {
+ public:
+ explicit CurrentTimeClient(DateTime& dateTimeController);
+ void Init();
+ bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service);
+ int OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error *error,
+ const ble_gatt_chr *characteristic);
+ int OnCurrentTimeReadResult(uint16_t conn_handle, const ble_gatt_error *error, const ble_gatt_attr *attribute);
+ bool IsDiscovered() const;
+ uint16_t StartHandle() const;
+ uint16_t EndHandle() const;
+ uint16_t CurrentTimeHandle() const;
+ static constexpr const ble_uuid16_t* Uuid() { return &CurrentTimeClient::ctsServiceUuid; }
+ static constexpr const ble_uuid16_t* CurrentTimeCharacteristicUuid() { return &CurrentTimeClient::currentTimeCharacteristicUuid; }
+ private:
+ typedef struct __attribute__((packed)) {
+ uint16_t year;
+ uint8_t month;
+ uint8_t dayofmonth;
+ uint8_t hour;
+ uint8_t minute;
+ uint8_t second;
+ uint8_t millis;
+ uint8_t reason;
+ } CtsData;
- static constexpr uint16_t ctsServiceId {0x1805};
- static constexpr uint16_t currentTimeCharacteristicId {0x2a2b};
+ static constexpr uint16_t ctsServiceId {0x1805};
+ static constexpr uint16_t currentTimeCharacteristicId {0x2a2b};
- static constexpr ble_uuid16_t ctsServiceUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = ctsServiceId
- };
- static constexpr ble_uuid16_t currentTimeCharacteristicUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = currentTimeCharacteristicId
- };
+ static constexpr ble_uuid16_t ctsServiceUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = ctsServiceId
+ };
+ static constexpr ble_uuid16_t currentTimeCharacteristicUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = currentTimeCharacteristicId
+ };
- uint16_t currentTimeHandle;
- DateTime& dateTimeController;
- bool isDiscovered = false;
- uint16_t ctsStartHandle;
- uint16_t ctsEndHandle;
- };
- }
+ uint16_t currentTimeHandle;
+ DateTime& dateTimeController;
+ bool isDiscovered = false;
+ uint16_t ctsStartHandle;
+ uint16_t ctsEndHandle;
+ };
+ }
} \ No newline at end of file
diff --git a/src/Components/Ble/CurrentTimeService.cpp b/src/Components/Ble/CurrentTimeService.cpp
new file mode 100644
index 00000000..9ae4c3b8
--- /dev/null
+++ b/src/Components/Ble/CurrentTimeService.cpp
@@ -0,0 +1,83 @@
+#include "CurrentTimeService.h"
+#include <hal/nrf_rtc.h>
+
+using namespace Pinetime::Controllers;
+
+constexpr ble_uuid16_t CurrentTimeService::ctsUuid;
+constexpr ble_uuid16_t CurrentTimeService::ctChrUuid;
+
+
+int CTSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
+ auto cts = static_cast<CurrentTimeService*>(arg);
+ return cts->OnTimeAccessed(conn_handle, attr_handle, ctxt);
+}
+
+void CurrentTimeService::Init() {
+ ble_gatts_count_cfg(serviceDefinition);
+ ble_gatts_add_svcs(serviceDefinition);
+}
+
+
+int CurrentTimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt) {
+
+ NRF_LOG_INFO("Setting time...");
+
+ if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
+ CtsData result;
+ os_mbuf_copydata(ctxt->om, 0, sizeof(CtsData), &result);
+
+ NRF_LOG_INFO("Received data: %d-%d-%d %d:%d:%d", result.year,
+ result.month, result.dayofmonth,
+ result.hour, result.minute, result.second);
+
+ m_dateTimeController.SetTime(result.year, result.month, result.dayofmonth,
+ 0, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG));
+
+ } else if (ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
+ CtsData currentDateTime;
+ currentDateTime.year = m_dateTimeController.Year();
+ currentDateTime.month = static_cast<u_int8_t>(m_dateTimeController.Month());
+ currentDateTime.dayofmonth = m_dateTimeController.Day();
+ currentDateTime.hour = m_dateTimeController.Hours();
+ currentDateTime.minute = m_dateTimeController.Minutes();
+ currentDateTime.second = m_dateTimeController.Seconds();
+ currentDateTime.millis = 0;
+
+
+ int res = os_mbuf_append(ctxt->om, &currentDateTime, sizeof(CtsData));
+ return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+
+ }
+
+ return 0;
+}
+
+CurrentTimeService::CurrentTimeService(DateTime &dateTimeController) : m_dateTimeController{dateTimeController},
+ characteristicDefinition{
+ {
+ .uuid = (ble_uuid_t *) &ctChrUuid,
+ .access_cb = CTSCallback,
+
+ .arg = this,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ
+ },
+ {
+ 0
+ }
+ },
+ serviceDefinition{
+ {
+ /* Device Information Service */
+ .type = BLE_GATT_SVC_TYPE_PRIMARY,
+ .uuid = (ble_uuid_t *) &ctsUuid,
+ .characteristics = characteristicDefinition
+ },
+ {
+ 0
+ },
+ }
+ {
+
+}
+
diff --git a/src/Components/Ble/CurrentTimeService.h b/src/Components/Ble/CurrentTimeService.h
new file mode 100644
index 00000000..58bc5ba6
--- /dev/null
+++ b/src/Components/Ble/CurrentTimeService.h
@@ -0,0 +1,48 @@
+#pragma once
+#include <cstdint>
+#include <array>
+#include <Components/DateTime/DateTimeController.h>
+#include <host/ble_gap.h>
+
+namespace Pinetime {
+ namespace Controllers {
+ class CurrentTimeService {
+ public:
+ CurrentTimeService(DateTime &dateTimeController);
+ void Init();
+
+ int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt);
+
+ private:
+ static constexpr uint16_t ctsId {0x1805};
+ static constexpr uint16_t ctsCharId {0x2a2b};
+
+ static constexpr ble_uuid16_t ctsUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = ctsId
+ };
+
+ static constexpr ble_uuid16_t ctChrUuid {
+ .u { .type = BLE_UUID_TYPE_16 },
+ .value = ctsCharId
+ };
+
+ struct ble_gatt_chr_def characteristicDefinition[2];
+ struct ble_gatt_svc_def serviceDefinition[2];
+
+ typedef struct __attribute__((packed)) {
+ uint16_t year;
+ uint8_t month;
+ uint8_t dayofmonth;
+ uint8_t hour;
+ uint8_t minute;
+ uint8_t second;
+ uint8_t millis;
+ uint8_t reason;
+ } CtsData;
+
+ DateTime &m_dateTimeController;
+ };
+ }
+}
diff --git a/src/Components/Ble/NimbleController.cpp b/src/Components/Ble/NimbleController.cpp
index d2ee4801..7a7753b1 100644
--- a/src/Components/Ble/NimbleController.cpp
+++ b/src/Components/Ble/NimbleController.cpp
@@ -33,7 +33,9 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
spiNorFlash{spiNorFlash},
dfuService{systemTask, bleController, spiNorFlash},
currentTimeClient{dateTimeController},
- alertNotificationClient{systemTask, notificationManager} {
+ alertNotificationClient{systemTask, notificationManager},
+ anService{systemTask, notificationManager},
+ currentTimeService{dateTimeController} {
}
@@ -76,6 +78,11 @@ void NimbleController::Init() {
ble_svc_gatt_init();
deviceInformationService.Init();
+ currentTimeClient.Init();
+ currentTimeService.Init();
+
+ anService.Init();
+
dfuService.Init();
int res;
res = ble_hs_util_ensure_addr(0);
@@ -131,7 +138,12 @@ void NimbleController::StartAdvertising() {
res = ble_gap_adv_start(addrType, NULL, 10000,
&adv_params, GAPEventCallback, this);
-// ASSERT(res == 0);
+// ASSERT(res == 0);// TODO I've disabled these ASSERT as they sometime asserts and reset the mcu.
+ // For now, the advertising is restarted as soon as it ends. There may be a race condition
+ // that prevent the advertising from restarting reliably.
+ // I remove the assert to prevent this uncesseray crash, but in the long term, the management of
+ // the advertising should be improve (better error handling, and advertise for 3 minutes after
+ // the application has been woken up, for example.
}
int OnAllSvrDisco(uint16_t conn_handle,
diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h
index 9f74be2b..7e680607 100644
--- a/src/Components/Ble/NimbleController.h
+++ b/src/Components/Ble/NimbleController.h
@@ -1,10 +1,12 @@
#pragma once
#include <cstdint>
+#include "AlertNotificationService.h"
#include "AlertNotificationClient.h"
#include "DeviceInformationService.h"
#include "CurrentTimeClient.h"
#include "DfuService.h"
+#include "CurrentTimeService.h"
#include <host/ble_gap.h>
namespace Pinetime {
@@ -44,7 +46,10 @@ namespace Pinetime {
DeviceInformationService deviceInformationService;
CurrentTimeClient currentTimeClient;
+ AlertNotificationService anService;
AlertNotificationClient alertNotificationClient;
+ CurrentTimeService currentTimeService;
+
uint8_t addrType;
uint16_t connectionHandle;
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 16:33:48 +0000