Merge pull request #8165 from mprse/issue_8155_fix

0xc0170 · web-flow · commit ac6ca73dd8a7 · 2018-09-24T12:59:22.000+02:00
Fix for issue #8155 (NRF52832: time stops after 35 minutes)
diff --git a/platform/mbed_rtc_time.cpp b/platform/mbed_rtc_time.cpp
@@ -33,6 +33,8 @@ static void (*_rtc_write)(time_t t) = rtc_write;
 
 #include "drivers/LowPowerTimer.h"
 
+#define US_PER_SEC 1000000
+
 static SingletonPtr<mbed::LowPowerTimer> _rtc_lp_timer;
 static uint64_t _rtc_lp_base;
 static bool _rtc_enabled;
@@ -50,7 +52,7 @@ static int _rtc_lpticker_isenabled(void)
 
 static time_t _rtc_lpticker_read(void)
 {
-    return (uint64_t)_rtc_lp_timer->read() + _rtc_lp_base;
+    return _rtc_lp_timer->read_high_resolution_us() / US_PER_SEC + _rtc_lp_base;
 }
 
 static void _rtc_lpticker_write(time_t t)

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ static void (*_rtc_write)(time_t t) = rtc_write;`
`33`	`33`
`34`	`34`	`#include "drivers/LowPowerTimer.h"`
`35`	`35`
	`36`	`+#define US_PER_SEC 1000000`
	`37`	`+`
`36`	`38`	`static SingletonPtr<mbed::LowPowerTimer> _rtc_lp_timer;`
`37`	`39`	`static uint64_t _rtc_lp_base;`
`38`	`40`	`static bool _rtc_enabled;`
`@@ -50,7 +52,7 @@ static int _rtc_lpticker_isenabled(void)`
`50`	`52`
`51`	`53`	`static time_t _rtc_lpticker_read(void)`
`52`	`54`	`{`
`53`		`- return (uint64_t)_rtc_lp_timer->read() + _rtc_lp_base;`
	`55`	`+ return _rtc_lp_timer->read_high_resolution_us() / US_PER_SEC + _rtc_lp_base;`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`static void _rtc_lpticker_write(time_t t)`