CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DateTimeController: Remove SetTime tick parameter

Browse Source 
The systick doesn't need to be updated when setting time.

Also removed unused nrf_rtc.h includes.
This commit is contained in:
Riku Isokoski
2023-02-24 07:38:16 +02:00
parent eccea5ab9f
commit b63bb798ac
8 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/displayapp/screens/settings/SettingSetDate.cpp
View File

@@ -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();
}

4
src/displayapp/screens/settings/SettingSetTime.cpp
View File

@@ -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();
}