diff options
author | Adam Pigg <adam@piggz.co.uk> | 2020-04-28 18:39:26 +0100 |
---|---|---|
committer | Adam Pigg <adam@piggz.co.uk> | 2020-04-28 18:39:26 +0100 |
commit | 5df4c1016ae9e0ca65061c12117691301ca93766 (patch) | |
tree | caa79b6bc52f75957071c98cc9499ab9b89c9514 /src/Components/Ble/PinetimeService.cpp | |
parent | 423a956d8f3fdbac9db310e3223280a4624ff49e (diff) |
Run the alert notification service and simplify trhe pinetime service
initialization
Diffstat (limited to 'src/Components/Ble/PinetimeService.cpp')
-rw-r--r-- | src/Components/Ble/PinetimeService.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
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; -} |