From 9115c49bba366698c79b3fc07a991bee1c0cd4ca Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Sun, 7 Jun 2020 20:31:13 +0200
Subject: Fix reset reason (it returns the actual reset reason instead of hard
 coded 'hard reset' value).

---
 src/drivers/Watchdog.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Watchdog.cpp b/src/drivers/Watchdog.cpp
index 850fd2f1..11da1211 100644
--- a/src/drivers/Watchdog.cpp
+++ b/src/drivers/Watchdog.cpp
@@ -32,17 +32,17 @@ void Watchdog::Kick() {
 }
 
 Watchdog::ResetReasons Watchdog::ActualResetReason() const {
-  uint32_t resetReason;
-//  sd_power_reset_reason_get(&resetReason);
-//  sd_power_reset_reason_clr(0xFFFFFFFF);
-//  if(resetReason & 0x01u) return ResetReasons::ResetPin;
-//  if((resetReason >> 1u) & 0x01u) return ResetReasons::Watchdog;
-//  if((resetReason >> 2u) & 0x01u) return ResetReasons::SoftReset;
-//  if((resetReason >> 3u) & 0x01u) return ResetReasons::CpuLockup;
-//  if((resetReason >> 16u) & 0x01u) return ResetReasons::SystemOff;
-//  if((resetReason >> 17u) & 0x01u) return ResetReasons::LpComp;
-//  if((resetReason >> 18u) & 0x01u) return ResetReasons::DebugInterface;
-//  if((resetReason >> 19u) & 0x01u) return ResetReasons::NFC;
+  uint32_t reason = NRF_POWER->RESETREAS;
+  NRF_POWER->RESETREAS = 0xffffffff;
+
+  if(reason & 0x01u) return ResetReasons::ResetPin;
+  if((reason >> 1u) & 0x01u) return ResetReasons::Watchdog;
+  if((reason >> 2u) & 0x01u) return ResetReasons::SoftReset;
+  if((reason >> 3u) & 0x01u) return ResetReasons::CpuLockup;
+  if((reason >> 16u) & 0x01u) return ResetReasons::SystemOff;
+  if((reason >> 17u) & 0x01u) return ResetReasons::LpComp;
+  if((reason) & 0x01u) return ResetReasons::DebugInterface;
+  if((reason >> 19u) & 0x01u) return ResetReasons::NFC;
   return ResetReasons::HardReset;
 }
 
-- 
cgit v1.2.3-70-g09d2


From f133d1e9ea9e5d679f41545fac8d09a6760db0d8 Mon Sep 17 00:00:00 2001
From: JF <jf@codingfield.com>
Date: Tue, 16 Jun 2020 20:44:11 +0200
Subject: Fix #include that were pointing to my own FS instead of relative
 paths to the SDK.

---
 src/drivers/InternalFlash.cpp | 2 +-
 src/graphics.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/InternalFlash.cpp b/src/drivers/InternalFlash.cpp
index bc89ff1a..db705d78 100644
--- a/src/drivers/InternalFlash.cpp
+++ b/src/drivers/InternalFlash.cpp
@@ -1,4 +1,4 @@
-#include <sdk/modules/nrfx/mdk/nrf.h>
+#include <mdk/nrf.h>
 #include "InternalFlash.h"
 using namespace Pinetime::Drivers;
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index d95ba3fa..8c39c89a 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -3,7 +3,7 @@
 #include <drivers/SpiMaster.h>
 #include <drivers/Spi.h>
 #include <drivers/SpiNorFlash.h>
-#include <sdk/components/libraries/log/nrf_log.h>
+#include <libraries/log/nrf_log.h>
 #include "bootloader/boot_graphics.h"
 #include <FreeRTOS.h>
 #include <task.h>
-- 
cgit v1.2.3-70-g09d2