From b63bb798acd9bc40adda78774e1c433ef21995a5 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Fri, 24 Feb 2023 07:38:16 +0200 Subject: DateTimeController: Remove SetTime tick parameter The systick doesn't need to be updated when setting time. Also removed unused nrf_rtc.h includes. --- src/components/ble/CurrentTimeClient.cpp | 4 +--- src/components/ble/CurrentTimeService.cpp | 4 +--- src/components/ble/NimbleController.cpp | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/components/ble') diff --git a/src/components/ble/CurrentTimeClient.cpp b/src/components/ble/CurrentTimeClient.cpp index e535ae83..7df07106 100644 --- a/src/components/ble/CurrentTimeClient.cpp +++ b/src/components/ble/CurrentTimeClient.cpp @@ -1,5 +1,4 @@ #include "components/ble/CurrentTimeClient.h" -#include #include #include "components/datetime/DateTimeController.h" @@ -88,8 +87,7 @@ int CurrentTimeClient::OnCurrentTimeReadResult(uint16_t conn_handle, const ble_g uint16_t year = ((uint16_t) result.year_MSO << 8) + result.year_LSO; NRF_LOG_INFO("Received data: %d-%d-%d %d:%d:%d", year, result.month, result.dayofmonth, result.hour, result.minute, result.second); - dateTimeController - .SetTime(year, result.month, result.dayofmonth, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG)); + dateTimeController.SetTime(year, result.month, result.dayofmonth, result.hour, result.minute, result.second); } else { NRF_LOG_INFO("Error retrieving current time: %d", error->status); } diff --git a/src/components/ble/CurrentTimeService.cpp b/src/components/ble/CurrentTimeService.cpp index 856bc63a..012951cb 100644 --- a/src/components/ble/CurrentTimeService.cpp +++ b/src/components/ble/CurrentTimeService.cpp @@ -1,5 +1,4 @@ #include "components/ble/CurrentTimeService.h" -#include #include using namespace Pinetime::Controllers; @@ -50,8 +49,7 @@ int CurrentTimeService::OnCurrentTimeAccessed(struct ble_gatt_access_ctxt* ctxt) NRF_LOG_INFO("Received data: %d-%d-%d %d:%d:%d", year, result.month, result.dayofmonth, result.hour, result.minute, result.second); - m_dateTimeController - .SetTime(year, result.month, result.dayofmonth, result.hour, result.minute, result.second, nrf_rtc_counter_get(portNRF_RTC_REG)); + m_dateTimeController.SetTime(year, result.month, result.dayofmonth, result.hour, result.minute, result.second); } else if (ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) { CtsCurrentTimeData currentDateTime; diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index 912f5927..74c8f926 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -1,7 +1,6 @@ #include "components/ble/NimbleController.h" #include -#include #include #define min // workaround: nimble's min/max macros conflict with libstdc++ #define max -- cgit v1.2.3-70-g09d2