From f201c9afdc71eba0eb05837d09f37fcb59a76d1e Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 28 Apr 2020 11:21:35 +0100 Subject: [PATCH 1/5] Add a simple service to allow setting the time from a controlling application --- src/CMakeLists.txt | 1 + src/Components/Ble/NimbleController.cpp | 3 + src/Components/Ble/NimbleController.h | 2 + src/Components/Ble/PinetimeService.cpp | 73 +++++++++++++++++++++++++ src/Components/Ble/PinetimeService.h | 50 +++++++++++++++++ 5 files changed, 129 insertions(+) create mode 100644 src/Components/Ble/PinetimeService.cpp create mode 100644 src/Components/Ble/PinetimeService.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad83caee..ede2bade 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -319,6 +319,7 @@ list(APPEND SOURCE_FILES Components/Ble/DeviceInformationService.cpp Components/Ble/CurrentTimeClient.cpp Components/Ble/AlertNotificationClient.cpp + Components/Ble/PinetimeService.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c diff --git a/src/Components/Ble/NimbleController.cpp b/src/Components/Ble/NimbleController.cpp index 7894ff43..6a8257b8 100644 --- a/src/Components/Ble/NimbleController.cpp +++ b/src/Components/Ble/NimbleController.cpp @@ -72,6 +72,9 @@ void NimbleController::Init() { deviceInformationService.Init(); currentTimeClient.Init(); + pinetimeService.Init(); + pinetimeService.setDateTimeController(&dateTimeController); + int res; res = ble_hs_util_ensure_addr(0); res = ble_hs_id_infer_auto(0, &addrType); diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h index 7a7a94c9..dffd80c0 100644 --- a/src/Components/Ble/NimbleController.h +++ b/src/Components/Ble/NimbleController.h @@ -4,6 +4,7 @@ #include "AlertNotificationClient.h" #include "DeviceInformationService.h" #include "CurrentTimeClient.h" +#include "PinetimeService.h" #include namespace Pinetime { @@ -34,6 +35,7 @@ namespace Pinetime { DeviceInformationService deviceInformationService; CurrentTimeClient currentTimeClient; AlertNotificationClient alertNotificationClient; + PinetimeService pinetimeService; uint8_t addrType; uint16_t connectionHandle; }; diff --git a/src/Components/Ble/PinetimeService.cpp b/src/Components/Ble/PinetimeService.cpp new file mode 100644 index 00000000..5bcb36d1 --- /dev/null +++ b/src/Components/Ble/PinetimeService.cpp @@ -0,0 +1,73 @@ +#include "PinetimeService.h" +#include + +using namespace Pinetime::Controllers; + +constexpr ble_uuid16_t PinetimeService::pinetimeUuid; +constexpr ble_uuid16_t PinetimeService::timeUuid; + + +int PinetimeTimeCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { + auto pinetimeService = static_cast(arg); + return pinetimeService->OnTimeAccessed(conn_handle, attr_handle, ctxt); +} + +void PinetimeService::Init() { + ble_gatts_count_cfg(serviceDefinition); + ble_gatts_add_svcs(serviceDefinition); +} + + +int PinetimeService::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) { + if (m_dateTimeController) { + 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)); + } + } + return 0; +} + +PinetimeService::PinetimeService() : + characteristicDefinition{ + { + .uuid = (ble_uuid_t *) &timeUuid, + .access_cb = PinetimeTimeCallback, + + .arg = this, + .flags = BLE_GATT_CHR_F_WRITE + }, + { + 0 + } + }, + serviceDefinition{ + { + /* Device Information Service */ + .type = BLE_GATT_SVC_TYPE_PRIMARY, + .uuid = (ble_uuid_t *) &pinetimeUuid, + .characteristics = characteristicDefinition + }, + { + 0 + }, + } + { + +} + +void PinetimeService::setDateTimeController(DateTime *dateTimeController) +{ + m_dateTimeController = dateTimeController; +} diff --git a/src/Components/Ble/PinetimeService.h b/src/Components/Ble/PinetimeService.h new file mode 100644 index 00000000..d4f8ee2b --- /dev/null +++ b/src/Components/Ble/PinetimeService.h @@ -0,0 +1,50 @@ +#pragma once +#include +#include +#include +#include + +namespace Pinetime { + namespace Controllers { + class PinetimeService { + public: + PinetimeService(); + void Init(); + + int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, + struct ble_gatt_access_ctxt *ctxt); + + void setDateTimeController(DateTime *dateTimeController); + + private: + static constexpr uint16_t pinetimeId {0x6666}; + static constexpr uint16_t timeCharId {0x6667}; + + static constexpr ble_uuid16_t pinetimeUuid { + .u { .type = BLE_UUID_TYPE_16 }, + .value = pinetimeId + }; + + static constexpr ble_uuid16_t timeUuid { + .u { .type = BLE_UUID_TYPE_16 }, + .value = timeCharId + }; + + 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 = nullptr; + }; + } +} From 423a956d8f3fdbac9db310e3223280a4624ff49e Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 28 Apr 2020 18:31:58 +0100 Subject: [PATCH 2/5] Add a very basic alert nofification service --- .../Ble/AlertNotificationService.cpp | 73 +++++++++++++++++++ src/Components/Ble/AlertNotificationService.h | 39 ++++++++++ 2 files changed, 112 insertions(+) create mode 100644 src/Components/Ble/AlertNotificationService.cpp create mode 100644 src/Components/Ble/AlertNotificationService.h 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 +#include "NotificationManager.h" +#include + +#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(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 +#include +#include + +namespace Pinetime { + namespace Controllers { + class AlertNotificationService { + public: + AlertNotificationService(Pinetime::System::SystemTask &systemTask, + Pinetime::Controllers::NotificationManager ¬ificationManager); + 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; + }; + } +} From 5df4c1016ae9e0ca65061c12117691301ca93766 Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 28 Apr 2020 18:39:26 +0100 Subject: [PATCH 3/5] Run the alert notification service and simplify trhe pinetime service initialization --- src/CMakeLists.txt | 1 + src/Components/Ble/NimbleController.cpp | 7 +++++-- src/Components/Ble/NimbleController.h | 3 +++ src/Components/Ble/PinetimeService.cpp | 23 +++++++++-------------- src/Components/Ble/PinetimeService.h | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ede2bade..e2bf9620 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -320,6 +320,7 @@ list(APPEND SOURCE_FILES Components/Ble/CurrentTimeClient.cpp Components/Ble/AlertNotificationClient.cpp Components/Ble/PinetimeService.cpp + Components/Ble/AlertNotificationService.cpp drivers/Cst816s.cpp FreeRTOS/port.c FreeRTOS/port_cmsis_systick.c diff --git a/src/Components/Ble/NimbleController.cpp b/src/Components/Ble/NimbleController.cpp index 6a8257b8..90f60c0d 100644 --- a/src/Components/Ble/NimbleController.cpp +++ b/src/Components/Ble/NimbleController.cpp @@ -28,7 +28,9 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, dateTimeController{dateTimeController}, notificationManager{notificationManager}, currentTimeClient{dateTimeController}, - alertNotificationClient{systemTask, notificationManager} { + alertNotificationClient{systemTask, notificationManager}, + anService{systemTask, notificationManager}, + pinetimeService{dateTimeController} { } @@ -73,7 +75,8 @@ void NimbleController::Init() { deviceInformationService.Init(); currentTimeClient.Init(); pinetimeService.Init(); - pinetimeService.setDateTimeController(&dateTimeController); + + anService.Init(); int res; res = ble_hs_util_ensure_addr(0); diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h index dffd80c0..13dfbdb0 100644 --- a/src/Components/Ble/NimbleController.h +++ b/src/Components/Ble/NimbleController.h @@ -1,6 +1,7 @@ #pragma once #include +#include "AlertNotificationService.h" #include "AlertNotificationClient.h" #include "DeviceInformationService.h" #include "CurrentTimeClient.h" @@ -34,8 +35,10 @@ namespace Pinetime { DeviceInformationService deviceInformationService; CurrentTimeClient currentTimeClient; + AlertNotificationService anService; AlertNotificationClient alertNotificationClient; PinetimeService pinetimeService; + uint8_t addrType; uint16_t connectionHandle; }; diff --git a/src/Components/Ble/PinetimeService.cpp b/src/Components/Ble/PinetimeService.cpp index 5bcb36d1..e18d78aa 100644 --- a/src/Components/Ble/PinetimeService.cpp +++ b/src/Components/Ble/PinetimeService.cpp @@ -24,22 +24,21 @@ int PinetimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, NRF_LOG_INFO("Setting time..."); if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { - if (m_dateTimeController) { - CtsData result; - os_mbuf_copydata(ctxt->om, 0, sizeof(CtsData), &result); + 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); + 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)); - m_dateTimeController->SetTime(result.year, result.month, result.dayofmonth, - 0, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG)); - } } return 0; } -PinetimeService::PinetimeService() : +PinetimeService::PinetimeService(DateTime &dateTimeController) : m_dateTimeController{dateTimeController}, characteristicDefinition{ { .uuid = (ble_uuid_t *) &timeUuid, @@ -67,7 +66,3 @@ PinetimeService::PinetimeService() : } -void PinetimeService::setDateTimeController(DateTime *dateTimeController) -{ - m_dateTimeController = dateTimeController; -} diff --git a/src/Components/Ble/PinetimeService.h b/src/Components/Ble/PinetimeService.h index d4f8ee2b..0cae8345 100644 --- a/src/Components/Ble/PinetimeService.h +++ b/src/Components/Ble/PinetimeService.h @@ -8,7 +8,7 @@ namespace Pinetime { namespace Controllers { class PinetimeService { public: - PinetimeService(); + PinetimeService(DateTime &dateTimeController); void Init(); int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, @@ -44,7 +44,7 @@ namespace Pinetime { uint8_t reason; } CtsData; - DateTime *m_dateTimeController = nullptr; + DateTime &m_dateTimeController; }; } } From 9935fb193c7f8c109d8fc4de6e030d4146f35f5f Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Mon, 4 May 2020 21:43:51 +0100 Subject: [PATCH 4/5] Move PinetimeService to CurrentTimeService witha view to implement CTS for time handling --- src/CMakeLists.txt | 2 +- ...timeService.cpp => CurrentTimeService.cpp} | 27 ++++++++++--------- ...PinetimeService.h => CurrentTimeService.h} | 18 ++++++------- src/Components/Ble/NimbleController.cpp | 4 +-- src/Components/Ble/NimbleController.h | 4 +-- 5 files changed, 27 insertions(+), 28 deletions(-) rename src/Components/Ble/{PinetimeService.cpp => CurrentTimeService.cpp} (59%) rename src/Components/Ble/{PinetimeService.h => CurrentTimeService.h} (68%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e2bf9620..11a345c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -319,7 +319,7 @@ list(APPEND SOURCE_FILES Components/Ble/DeviceInformationService.cpp Components/Ble/CurrentTimeClient.cpp Components/Ble/AlertNotificationClient.cpp - Components/Ble/PinetimeService.cpp + Components/Ble/CurrentTimeService.cpp Components/Ble/AlertNotificationService.cpp drivers/Cst816s.cpp FreeRTOS/port.c diff --git a/src/Components/Ble/PinetimeService.cpp b/src/Components/Ble/CurrentTimeService.cpp similarity index 59% rename from src/Components/Ble/PinetimeService.cpp rename to src/Components/Ble/CurrentTimeService.cpp index e18d78aa..0af20dd3 100644 --- a/src/Components/Ble/PinetimeService.cpp +++ b/src/Components/Ble/CurrentTimeService.cpp @@ -1,24 +1,24 @@ -#include "PinetimeService.h" +#include "CurrentTimeService.h" #include using namespace Pinetime::Controllers; -constexpr ble_uuid16_t PinetimeService::pinetimeUuid; -constexpr ble_uuid16_t PinetimeService::timeUuid; +constexpr ble_uuid16_t CurrentTimeService::ctsUuid; +constexpr ble_uuid16_t CurrentTimeService::ctChrUuid; -int PinetimeTimeCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { - auto pinetimeService = static_cast(arg); - return pinetimeService->OnTimeAccessed(conn_handle, attr_handle, ctxt); +int CTSCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { + auto cts = static_cast(arg); + return cts->OnTimeAccessed(conn_handle, attr_handle, ctxt); } -void PinetimeService::Init() { +void CurrentTimeService::Init() { ble_gatts_count_cfg(serviceDefinition); ble_gatts_add_svcs(serviceDefinition); } -int PinetimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, +int CurrentTimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt) { NRF_LOG_INFO("Setting time..."); @@ -35,17 +35,18 @@ int PinetimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, 0, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG)); } + //!TODO need to support reading the time. return 0; } -PinetimeService::PinetimeService(DateTime &dateTimeController) : m_dateTimeController{dateTimeController}, +CurrentTimeService::CurrentTimeService(DateTime &dateTimeController) : m_dateTimeController{dateTimeController}, characteristicDefinition{ { - .uuid = (ble_uuid_t *) &timeUuid, - .access_cb = PinetimeTimeCallback, + .uuid = (ble_uuid_t *) &ctChrUuid, + .access_cb = CTSCallback, .arg = this, - .flags = BLE_GATT_CHR_F_WRITE + .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ }, { 0 @@ -55,7 +56,7 @@ PinetimeService::PinetimeService(DateTime &dateTimeController) : m_dateTimeContr { /* Device Information Service */ .type = BLE_GATT_SVC_TYPE_PRIMARY, - .uuid = (ble_uuid_t *) &pinetimeUuid, + .uuid = (ble_uuid_t *) &ctsUuid, .characteristics = characteristicDefinition }, { diff --git a/src/Components/Ble/PinetimeService.h b/src/Components/Ble/CurrentTimeService.h similarity index 68% rename from src/Components/Ble/PinetimeService.h rename to src/Components/Ble/CurrentTimeService.h index 0cae8345..58bc5ba6 100644 --- a/src/Components/Ble/PinetimeService.h +++ b/src/Components/Ble/CurrentTimeService.h @@ -6,28 +6,26 @@ namespace Pinetime { namespace Controllers { - class PinetimeService { + class CurrentTimeService { public: - PinetimeService(DateTime &dateTimeController); + CurrentTimeService(DateTime &dateTimeController); void Init(); int OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt); - void setDateTimeController(DateTime *dateTimeController); - private: - static constexpr uint16_t pinetimeId {0x6666}; - static constexpr uint16_t timeCharId {0x6667}; + static constexpr uint16_t ctsId {0x1805}; + static constexpr uint16_t ctsCharId {0x2a2b}; - static constexpr ble_uuid16_t pinetimeUuid { + static constexpr ble_uuid16_t ctsUuid { .u { .type = BLE_UUID_TYPE_16 }, - .value = pinetimeId + .value = ctsId }; - static constexpr ble_uuid16_t timeUuid { + static constexpr ble_uuid16_t ctChrUuid { .u { .type = BLE_UUID_TYPE_16 }, - .value = timeCharId + .value = ctsCharId }; struct ble_gatt_chr_def characteristicDefinition[2]; diff --git a/src/Components/Ble/NimbleController.cpp b/src/Components/Ble/NimbleController.cpp index 90f60c0d..3e549653 100644 --- a/src/Components/Ble/NimbleController.cpp +++ b/src/Components/Ble/NimbleController.cpp @@ -30,7 +30,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, currentTimeClient{dateTimeController}, alertNotificationClient{systemTask, notificationManager}, anService{systemTask, notificationManager}, - pinetimeService{dateTimeController} { + currentTimeService{dateTimeController} { } @@ -74,7 +74,7 @@ void NimbleController::Init() { deviceInformationService.Init(); currentTimeClient.Init(); - pinetimeService.Init(); + currentTimeService.Init(); anService.Init(); diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h index 13dfbdb0..7a08a73c 100644 --- a/src/Components/Ble/NimbleController.h +++ b/src/Components/Ble/NimbleController.h @@ -5,7 +5,7 @@ #include "AlertNotificationClient.h" #include "DeviceInformationService.h" #include "CurrentTimeClient.h" -#include "PinetimeService.h" +#include "CurrentTimeService.h" #include namespace Pinetime { @@ -37,7 +37,7 @@ namespace Pinetime { CurrentTimeClient currentTimeClient; AlertNotificationService anService; AlertNotificationClient alertNotificationClient; - PinetimeService pinetimeService; + CurrentTimeService currentTimeService; uint8_t addrType; uint16_t connectionHandle; From a9a5bd0358c8e914852f5ad9ae0984b4b223c244 Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 5 May 2020 20:53:31 +0100 Subject: [PATCH 5/5] Add support for reading the current time --- src/Components/Ble/CurrentTimeService.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Components/Ble/CurrentTimeService.cpp b/src/Components/Ble/CurrentTimeService.cpp index 0af20dd3..a44a18a5 100644 --- a/src/Components/Ble/CurrentTimeService.cpp +++ b/src/Components/Ble/CurrentTimeService.cpp @@ -34,7 +34,22 @@ int CurrentTimeService::OnTimeAccessed(uint16_t conn_handle, uint16_t attr_handl 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(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, ¤tDateTime, sizeof(CtsData)); + return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; + } + //!TODO need to support reading the time. return 0; }