From b760b3f98ca786bbe0d586e30fed2847525b0ae4 Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 28 Apr 2020 11:21:35 +0100 Subject: Add a simple service to allow setting the time from a controlling application --- src/Components/Ble/NimbleController.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Components/Ble/NimbleController.h') diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h index 99e0c811..d315e97b 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 { @@ -35,6 +36,7 @@ namespace Pinetime { DeviceInformationService deviceInformationService; CurrentTimeClient currentTimeClient; AlertNotificationClient alertNotificationClient; + PinetimeService pinetimeService; uint8_t addrType; uint16_t connectionHandle; }; -- cgit v1.2.3-70-g09d2 From d33be52bc9cec10e530e1390f1cf812c12cd830e Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Tue, 28 Apr 2020 18:39:26 +0100 Subject: 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(-) (limited to 'src/Components/Ble/NimbleController.h') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2e14c02b..777faefc 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 77bab5de..eb765b80 100644 --- a/src/Components/Ble/NimbleController.cpp +++ b/src/Components/Ble/NimbleController.cpp @@ -30,7 +30,9 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, dateTimeController{dateTimeController}, notificationManager{notificationManager}, currentTimeClient{dateTimeController}, - alertNotificationClient{systemTask, notificationManager} { + alertNotificationClient{systemTask, notificationManager}, + anService{systemTask, notificationManager}, + pinetimeService{dateTimeController} { } @@ -75,7 +77,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 d315e97b..820b1c77 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" @@ -35,8 +36,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; }; } } -- cgit v1.2.3-70-g09d2 From 206bdbf5eb94ac967284862b5d7a270ed50195db Mon Sep 17 00:00:00 2001 From: Adam Pigg Date: Mon, 4 May 2020 21:43:51 +0100 Subject: Move PinetimeService to CurrentTimeService witha view to implement CTS for time handling --- src/CMakeLists.txt | 2 +- src/Components/Ble/CurrentTimeService.cpp | 69 +++++++++++++++++++++++++++++++ src/Components/Ble/CurrentTimeService.h | 48 +++++++++++++++++++++ src/Components/Ble/NimbleController.cpp | 4 +- src/Components/Ble/NimbleController.h | 4 +- src/Components/Ble/PinetimeService.cpp | 68 ------------------------------ src/Components/Ble/PinetimeService.h | 50 ---------------------- 7 files changed, 122 insertions(+), 123 deletions(-) create mode 100644 src/Components/Ble/CurrentTimeService.cpp create mode 100644 src/Components/Ble/CurrentTimeService.h delete mode 100644 src/Components/Ble/PinetimeService.cpp delete mode 100644 src/Components/Ble/PinetimeService.h (limited to 'src/Components/Ble/NimbleController.h') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 777faefc..4b1f7c16 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/CurrentTimeService.cpp b/src/Components/Ble/CurrentTimeService.cpp new file mode 100644 index 00000000..0af20dd3 --- /dev/null +++ b/src/Components/Ble/CurrentTimeService.cpp @@ -0,0 +1,69 @@ +#include "CurrentTimeService.h" +#include + +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(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)); + + } + //!TODO need to support reading the time. + 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 +#include +#include +#include + +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 eb765b80..826d255b 100644 --- a/src/Components/Ble/NimbleController.cpp +++ b/src/Components/Ble/NimbleController.cpp @@ -32,7 +32,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask, currentTimeClient{dateTimeController}, alertNotificationClient{systemTask, notificationManager}, anService{systemTask, notificationManager}, - pinetimeService{dateTimeController} { + currentTimeService{dateTimeController} { } @@ -76,7 +76,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 820b1c77..44fbbe2c 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 { @@ -38,7 +38,7 @@ namespace Pinetime { CurrentTimeClient currentTimeClient; AlertNotificationService anService; AlertNotificationClient alertNotificationClient; - PinetimeService pinetimeService; + CurrentTimeService currentTimeService; uint8_t addrType; uint16_t connectionHandle; diff --git a/src/Components/Ble/PinetimeService.cpp b/src/Components/Ble/PinetimeService.cpp deleted file mode 100644 index e18d78aa..00000000 --- a/src/Components/Ble/PinetimeService.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#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) { - 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(DateTime &dateTimeController) : m_dateTimeController{dateTimeController}, - 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 - }, - } - { - -} - diff --git a/src/Components/Ble/PinetimeService.h b/src/Components/Ble/PinetimeService.h deleted file mode 100644 index 0cae8345..00000000 --- a/src/Components/Ble/PinetimeService.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once -#include -#include -#include -#include - -namespace Pinetime { - namespace Controllers { - class PinetimeService { - public: - PinetimeService(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 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; - }; - } -} -- cgit v1.2.3-70-g09d2