diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2023-02-24 07:38:16 +0200 |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 17:22:25 +0200 |
| commit | b63bb798acd9bc40adda78774e1c433ef21995a5 (patch) | |
| tree | 6eb225eb665668b3d7c4b048fe38c91b8e6f72d6 /src/displayapp/screens/settings | |
| parent | eccea5ab9f43eea3c3ac6dbfb7e03dd81578191c (diff) | |
DateTimeController: Remove SetTime tick parameter
The systick doesn't need to be updated when setting time.
Also removed unused nrf_rtc.h includes.
Diffstat (limited to 'src/displayapp/screens/settings')
| -rw-r--r-- | src/displayapp/screens/settings/SettingSetDate.cpp | 10 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingSetTime.cpp | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp index 08add508..1c0c55a5 100644 --- a/src/displayapp/screens/settings/SettingSetDate.cpp +++ b/src/displayapp/screens/settings/SettingSetDate.cpp @@ -1,7 +1,6 @@ #include "displayapp/screens/settings/SettingSetDate.h" #include "displayapp/screens/settings/SettingSetDateTime.h" #include <lvgl/lvgl.h> -#include <hal/nrf_rtc.h> #include <nrf_log.h> #include "displayapp/DisplayApp.h" #include "displayapp/screens/Symbols.h" @@ -96,13 +95,8 @@ void SettingSetDate::HandleButtonPress() { const uint8_t monthValue = monthCounter.GetValue(); const uint8_t dayValue = dayCounter.GetValue(); NRF_LOG_INFO("Setting date (manually) to %04d-%02d-%02d", yearValue, monthValue, dayValue); - dateTimeController.SetTime(yearValue, - monthValue, - dayValue, - dateTimeController.Hours(), - dateTimeController.Minutes(), - dateTimeController.Seconds(), - nrf_rtc_counter_get(portNRF_RTC_REG)); + dateTimeController + .SetTime(yearValue, monthValue, dayValue, dateTimeController.Hours(), dateTimeController.Minutes(), dateTimeController.Seconds()); settingSetDateTime.Advance(); } diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp index efb8578f..e5a6be2f 100644 --- a/src/displayapp/screens/settings/SettingSetTime.cpp +++ b/src/displayapp/screens/settings/SettingSetTime.cpp @@ -1,6 +1,5 @@ #include "displayapp/screens/settings/SettingSetTime.h" #include <lvgl/lvgl.h> -#include <hal/nrf_rtc.h> #include <nrf_log.h> #include "displayapp/DisplayApp.h" #include "displayapp/screens/Symbols.h" @@ -100,7 +99,6 @@ void SettingSetTime::SetTime() { dateTimeController.Day(), static_cast<uint8_t>(hoursValue), static_cast<uint8_t>(minutesValue), - 0, - nrf_rtc_counter_get(portNRF_RTC_REG)); + 0); settingSetDateTime.Quit(); } |