scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into geekbozu-PersistantStorage

Browse source 
# Conflicts:
#	src/systemtask/SystemTask.cpp
This commit is contained in:
Jean-François Milants 2021-09-18 17:37:37 +02:00
commit f556003de3
9 changed files with 100 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/systemtask/SystemTask.cpp
View file

@ -376,6 +376,7 @@ void SystemTask::Work() {
monitor.Process();
uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG);
dateTimeController.UpdateTime(systick_counter);
NoInit_BackUpTime = dateTimeController.CurrentDateTime();
if (!nrf_gpio_pin_read(PinMap::Button))
watchdog.Kick();
}

1
src/systemtask/SystemTask.h
View file

@ -33,6 +33,7 @@
#include "drivers/Watchdog.h"
#include "Messages.h"
extern std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> NoInit_BackUpTime;
namespace Pinetime {
namespace Drivers {
class Cst816S;