Merge branch 'geekbozu-PersistantStorage' into develop

Author: JF002

.gitignore

@@ -38,4 +38,8 @@ Testing/Temporary/
 **/.DS_Store
 
 # Windows
-**/thumbs.db
+**/thumbs.db
+
+#VSCODE
+.vscode/.cortex-debug.registers.state.json
+.vscode/.cortex-debug.peripherals.state.json

.vscode/settings.json

@@ -5,5 +5,55 @@
         "-DNRF5_SDK_PATH=${env:NRF5_SDK_PATH}",
     ],
     "cmake.generator": "Unix Makefiles",
-    "clang-tidy.buildPath": "build/compile_commands.json"
+    "clang-tidy.buildPath": "build/compile_commands.json",
+    "files.associations": {
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "typeinfo": "cpp"
+    }
 }

gcc_nrf52-mcuboot.ld

@@ -6,12 +6,18 @@ GROUP(-lgcc -lc -lnosys)
 MEMORY
 {
   FLASH (rx) : ORIGIN = 0x08020, LENGTH = 0x78000
-  RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 0x10000
+  RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 64K
 }
 
 SECTIONS
 {
-}
+  .noinit(NOLOAD):
+  {
+    PROVIDE(__start_noinit_data = .);
+    *(.noinit)
+    PROVIDE(__stop_noinit_data = .);
+  } > RAM
+} INSERT AFTER .bss
 
 SECTIONS
 {

gcc_nrf52.ld

@@ -6,12 +6,18 @@ GROUP(-lgcc -lc -lnosys)
 MEMORY
 {
   FLASH (rx) : ORIGIN = 0x00000, LENGTH = 0x78000
-  RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 0x10000
+  RAM (rwx) :  ORIGIN = 0x20000000, LENGTH = 64K
 }
 
 SECTIONS
 {
-}
+  .noinit(NOLOAD):
+  {
+    PROVIDE(__start_noinit_data = .);
+    *(.noinit)
+    PROVIDE(__stop_noinit_data = .);
+  } > RAM
+} INSERT AFTER .bss
 
 SECTIONS
 {
@@ -44,6 +50,7 @@ SECTIONS
     PROVIDE(__stop_log_filter_data = .);
   } > RAM
 
+
 } INSERT AFTER .data;
 
 SECTIONS

src/components/datetime/DateTimeController.cpp

@@ -5,6 +5,10 @@
 
 using namespace Pinetime::Controllers;
 
+void DateTime::SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t) {
+  this->currentDateTime = t;
+}
+
 void DateTime::SetTime(
   uint16_t year, uint8_t month, uint8_t day, uint8_t dayOfWeek, uint8_t hour, uint8_t minute, uint8_t second, uint32_t systickCounter) {
   std::tm tm = {
@@ -67,7 +71,7 @@ void DateTime::UpdateTime(uint32_t systickCounter) {
   // Notify new day to SystemTask
   if (hour == 0 and not isMidnightAlreadyNotified) {
     isMidnightAlreadyNotified = true;
-    if(systemTask != nullptr)
+    if (systemTask != nullptr)
       systemTask->PushMessage(System::Messages::OnNewDay);
   } else if (hour != 0) {
     isMidnightAlreadyNotified = false;

src/components/datetime/DateTimeController.h

@@ -74,6 +74,7 @@ namespace Pinetime {
       }
 
       void Register(System::SystemTask* systemTask);
+      void SetCurrentTime(std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> t);
 
     private:
       uint16_t year = 0;

src/main.cpp

@@ -115,7 +115,6 @@ Pinetime::Controllers::FS fs {spiNorFlash};
 Pinetime::Controllers::Settings settingsController {fs};
 Pinetime::Controllers::MotorController motorController {settingsController};
 
-
 Pinetime::Applications::DisplayApp displayApp(lcd,
                                               lvgl,
                                               touchPanel,
@@ -156,6 +155,16 @@ Pinetime::System::SystemTask systemTask(spi,
                                         fs,
                                         touchHandler);
 
+/* 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) {
     systemTask.OnTouchEvent();
@@ -316,6 +325,15 @@ 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();

src/systemtask/SystemTask.cpp

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

src/systemtask/SystemTask.h

@@ -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;