"sys.uptime" diagnostic data

hal/inc/hal_dynalib.h

@@ -81,6 +81,8 @@ DYNALIB_FN(BASE_IDX + 18, hal,HAL_EEPROM_Has_Pending_Erase, bool(void))
 DYNALIB_FN(BASE_IDX + 19, hal,HAL_EEPROM_Perform_Pending_Erase, void(void))
 DYNALIB_FN(BASE_IDX + 20, hal, HAL_RTC_Time_Is_Valid, uint8_t(void*))
 
+DYNALIB_FN(BASE_IDX + 21, hal, hal_timer_millis, uint64_t(void*))
+
 DYNALIB_END(hal)
 
 #undef BASE_IDX

hal/inc/timer_hal.h

@@ -36,18 +36,23 @@
 
 /* Exported macros -----------------------------------------------------------*/
 
+#define HAL_Timer_Microseconds HAL_Timer_Get_Micro_Seconds
+#define HAL_Timer_Milliseconds HAL_Timer_Get_Milli_Seconds
+
 /* Exported functions --------------------------------------------------------*/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 system_tick_t HAL_Timer_Get_Micro_Seconds(void);
 system_tick_t HAL_Timer_Get_Milli_Seconds(void);
 
-#define HAL_Timer_Microseconds HAL_Timer_Get_Micro_Seconds
-#define HAL_Timer_Milliseconds HAL_Timer_Get_Milli_Seconds
+/**
+ * Returns the number of milliseconds passed since the device was last reset. This function is
+ * similar to HAL_Timer_Get_Milli_Seconds() but returns a 64-bit value.
+ */
+uint64_t hal_timer_millis(void* reserved);
 
 #ifdef __cplusplus
 }

hal/src/core/timer_hal.c

@@ -58,3 +58,8 @@ system_tick_t HAL_Timer_Get_Milli_Seconds(void)
 {
     return GetSystem1MsTick();
 }
+
+uint64_t hal_timer_millis(void* reserved)
+{
+    return GetSystem1MsTick();
+}

hal/src/gcc/timer_hal.cpp

@@ -1,9 +1,12 @@
-
 #include "timer_hal.h"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-auto start = boost::posix_time::microsec_clock::universal_time();
+namespace {
+
+const auto start = boost::posix_time::microsec_clock::universal_time();
+
+} // namespace
 
 system_tick_t HAL_Timer_Get_Micro_Seconds(void)
 {
@@ -14,10 +17,11 @@ system_tick_t HAL_Timer_Get_Micro_Seconds(void)
 
 system_tick_t HAL_Timer_Get_Milli_Seconds(void)
 {
-    auto now = boost::posix_time::microsec_clock::universal_time();
-    auto diff = now - start;
-    return diff.total_milliseconds();
+    return hal_timer_millis(nullptr);
 }
 
-
-
+uint64_t hal_timer_millis(void* reserved)
+{
+    const auto now = boost::posix_time::microsec_clock::universal_time();
+    return (now - start).total_milliseconds();
+}

hal/src/stm32f2xx/timer_hal.c

@@ -59,3 +59,8 @@ system_tick_t HAL_Timer_Get_Milli_Seconds(void)
     // review - wiced_time_get_time()) ??
     return GetSystem1MsTick();
 }
+
+uint64_t hal_timer_millis(void* reserved)
+{
+    return GetSystem1MsTick();
+}

hal/src/template/timer_hal.cpp

@@ -53,3 +53,8 @@ system_tick_t HAL_Timer_Get_Milli_Seconds(void)
 {
   return 0;
 }
+
+uint64_t hal_timer_millis(void* reserved)
+{
+  return 0;
+}

platform/MCU/newhal-mcu/inc/hw_ticks.h

@@ -48,9 +48,9 @@ void System1UsTick(void);
 /**
  * Fetch the current milliseconds count.
  * @return the number of milliseconds since the device was powered on or woken up from
- * sleep. Automatically wraps around when above UINT_MAX;
+ * sleep.
  */
-system_tick_t GetSystem1MsTick();
+uint64_t GetSystem1MsTick();
 
 /**
  * Fetch the current microseconds count.

platform/MCU/shared/STM32/inc/hw_ticks.h

@@ -21,17 +21,16 @@
 
 #pragma once
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
 #include "platform_config.h"
 #include "system_tick_hal.h"
 
-#define SYSTEM_US_TICKS		(SystemCoreClock / 1000000)//cycles per microsecond
+#define SYSTEM_US_TICKS     (SystemCoreClock / 1000000)//cycles per microsecond
 #define SYSTEM_TICK_COUNTER     (DWT->CYCCNT)
 
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
 /**
  * Increment the millisecond tick counter.
  */
@@ -45,9 +44,9 @@ void System1UsTick(void);
 /**
  * Fetch the current milliseconds count.
  * @return the number of milliseconds since the device was powered on or woken up from
- * sleep. Automatically wraps around when above UINT_MAX;
+ * sleep.
  */
-system_tick_t GetSystem1MsTick();
+uint64_t GetSystem1MsTick();
 
 /**
  * Fetch the current microseconds count.
@@ -56,11 +55,10 @@ system_tick_t GetSystem1MsTick();
  */
 system_tick_t GetSystem1UsTick();
 
-
 /**
  * Testing method that simulates advancing the time forward.
  */
-void __advance_system1MsTick(system_tick_t millis, system_tick_t micros_from_rollover);
+void __advance_system1MsTick(uint64_t millis, system_tick_t micros_from_rollover);
 
 void SysTick_Disable();
 

platform/MCU/shared/STM32/src/hw_ticks.c

@@ -26,7 +26,7 @@
 /**
  * The current millisecond counter value.
  */
-static volatile system_tick_t system_millis = 0;
+static volatile uint64_t system_millis = 0;
 
 /**
  * The system clock value at last time system_millis was updated. This is updated
@@ -42,7 +42,7 @@ void System1MsTick(void)
 	int is = __get_PRIMASK();
 	__disable_irq();
 
-    system_millis++;
+    ++system_millis;
     system_millis_clock = DWT->CYCCNT;
 
     if ((is & 1) == 0) {
@@ -54,16 +54,19 @@ void System1MsTick(void)
  * Fetches the current millisecond tick counter.
  * @return
  */
-system_tick_t GetSystem1MsTick()
+uint64_t GetSystem1MsTick()
 {
+    uint64_t millis = 0;
+
     int is = __get_PRIMASK();
     __disable_irq();
 
-    system_tick_t millis = system_millis + (DWT->CYCCNT-system_millis_clock) / SYSTEM_US_TICKS / 1000;
+    millis = system_millis + (DWT->CYCCNT - system_millis_clock) / SYSTEM_US_TICKS / 1000;
 
     if ((is & 1) == 0) {
         __enable_irq();
     }
+
 	return millis;
 }
 
@@ -81,7 +84,7 @@ system_tick_t GetSystem1UsTick()
 
     base_millis = system_millis;
     base_clock = system_millis_clock;
-    
+
     system_tick_t elapsed_since_millis = ((DWT->CYCCNT-base_clock) / SYSTEM_US_TICKS);
 
     if ((is & 1) == 0) {
@@ -93,14 +96,20 @@ system_tick_t GetSystem1UsTick()
 /**
  * Testing method that simulates advancing the time forward.
  */
-void __advance_system1MsTick(system_tick_t millis, system_tick_t micros_from_rollover)
+void __advance_system1MsTick(uint64_t millis, system_tick_t micros_from_rollover)
 {
-    DWT->CYCCNT = UINT_MAX-(micros_from_rollover*SYSTEM_US_TICKS);   // 10 seconds before rollover
+    const int is = __get_PRIMASK();
+    __disable_irq();
+
+    DWT->CYCCNT = UINT_MAX - (micros_from_rollover * SYSTEM_US_TICKS);
+    system_millis_clock = DWT->CYCCNT;
     system_millis = millis;
+
+    if ((is & 1) == 0) {
+        __enable_irq();
+    }
 }
 
 void SysTick_Disable() {
     SysTick->CTRL = SysTick->CTRL & ~SysTick_CTRL_ENABLE_Msk;
 }
-
-

system/src/main.cpp

@@ -53,6 +53,7 @@
 #include "spark_wiring_cellular.h"
 #include "spark_wiring_cellular_printable.h"
 #include "spark_wiring_led.h"
+#include "spark_wiring_diagnostics.h"
 
 #if PLATFORM_ID == 3
 // Application loop uses std::this_thread::sleep_for() to workaround 100% CPU usage on the GCC platform
@@ -626,9 +627,23 @@ class HALEventHandler {
     }
 };
 
+class UptimeDiagnosticData: public AbstractIntegerDiagnosticData {
+public:
+    UptimeDiagnosticData() :
+            AbstractIntegerDiagnosticData(DIAG_ID_SYSTEM_UPTIME, "sys.uptime") {
+    }
+
+    virtual int get(IntType& val) override {
+        val = System.uptime();
+        return 0; // OK
+    }
+};
+
 // Certain HAL events can be generated before app_setup_and_loop() is called. Using constructor of a
 // global variable allows to register a handler for HAL events early
-HALEventHandler halEventHandler;
+HALEventHandler g_halEventHandler;
+
+UptimeDiagnosticData g_uptimeDiagData;
 
 } // namespace
 

user/tests/wiring/api/system.cpp

@@ -241,4 +241,15 @@ test(system_mode_button)
 
     API_COMPILE(System.disableButtonMirror());
     API_COMPILE(System.disableButtonMirror(false));
-}
+}
+
+test(system_uptime_millis) {
+    uint64_t u64 = 0;
+    unsigned u = 0;
+
+    API_COMPILE(u64 = System.millis());
+    API_COMPILE(u = System.uptime());
+
+    (void)u64;
+    (void)u;
+}

user/tests/wiring/no_fixture_long_running/pwm.cpp

@@ -12,7 +12,7 @@
 
 static const uint32_t maxPulseSamples = 100;
 static const uint32_t minimumFrequency = 100;
- 
+
 uint8_t pwm_pins[] = {
 
 #if defined(STM32F2XX)
@@ -22,7 +22,7 @@ uint8_t pwm_pins[] = {
 #endif
 };
 
-static pin_t pin = pwm_pins[0];
+// static pin_t pin = pwm_pins[0];
 
 template <typename F> void for_all_pwm_pins(F callback)
 {