summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-26 02:21:02 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-26 02:21:02 (GMT)
commit1589e31b71b0f45eebd6fb95b53248a156821abb (patch)
treebc0e4ca7bc5a35670cf98b5d8b5dda75e2880d65
parent9acd3ff0f8d12d2e97095ac562cbff3c7e8647ac (diff)
no persist time
-rw-r--r--src/main.cpp18
-rw-r--r--src/systemtask/SystemTask.cpp1
-rw-r--r--src/systemtask/SystemTask.h1
3 files changed, 0 insertions, 20 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c41dfc4..252ed6b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -153,15 +153,6 @@ Pinetime::System::SystemTask systemTask(spi,
touchHandler,
buttonHandler);
-/* Variable Declarations for variables in noinit SRAM
- Increment NoInit_MagicValue upon adding variables to this area
-*/
-extern uint32_t __start_noinit_data;
-extern uint32_t __stop_noinit_data;
-static constexpr uint32_t NoInit_MagicValue = 0xDEAD0000;
-uint32_t NoInit_MagicWord __attribute__((section(".noinit")));
-std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> NoInit_BackUpTime __attribute__((section(".noinit")));
-
void nrfx_gpiote_evt_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
if (pin == Pinetime::PinMap::Cst816sIrq) {
@@ -320,16 +311,7 @@ int main(void) {
// retrieve version stored by bootloader
Pinetime::BootloaderVersion::SetVersion(NRF_TIMER2->CC[0]);
-
- if (NoInit_MagicWord == NoInit_MagicValue) {
- dateTimeController.SetCurrentTime(NoInit_BackUpTime);
- } else {
- //Clear Memory to known state
- memset(&__start_noinit_data,0,(uintptr_t)&__stop_noinit_data-(uintptr_t)&__start_noinit_data);
- NoInit_MagicWord = NoInit_MagicValue;
- }
-
lvgl.Init();
systemTask.Start();
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 7e59690..92a19e4 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -407,7 +407,6 @@ 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();
}
diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h
index 3bba716..4e248bc 100644
--- a/src/systemtask/SystemTask.h
+++ b/src/systemtask/SystemTask.h
@@ -33,7 +33,6 @@
#include "drivers/Watchdog.h"
#include "systemtask/Messages.h"
-extern std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> NoInit_BackUpTime;
namespace Pinetime {
namespace Drivers {
class Cst816S;