Fix/Updated systime.c/h.

Removed DeltaTime global variable definition. The value is stored on MCU backup registers.
Added SysTimeGetMcuTime API. Returns a SysTime_t value which corresponds to the elapsed time since the MCU started.

Author: mluis1

src/boards/SAML21/rtc-board.c

@@ -75,6 +75,14 @@ Gpio_t DbgRtcPin0;
 Gpio_t DbgRtcPin1;
 #endif
 
+/*!
+ * Used to store the Seconds and SubSeconds.
+ * 
+ * WARNING: Temporary fix fix. Should use MCU NVM internal
+ *          registers
+ */
+uint32_t RtcBkupRegisters[] = { 0, 0 };
+
 /*!
  * \brief Callback for the hw_timer when alarm expired
  */
@@ -220,12 +228,18 @@ uint32_t RtcGetCalendarTime( uint16_t *milliseconds )
 
 void RtcBkupWrite( uint32_t data0, uint32_t data1 )
 {
-    // Not implemented
+    CRITICAL_SECTION_BEGIN( );
+    RtcBkupRegisters[0] = data0;
+    RtcBkupRegisters[1] = data1;
+    CRITICAL_SECTION_END( );
 }
 
 void RtcBkupRead( uint32_t* data0, uint32_t* data1 )
 {
-    // Not implemented
+    CRITICAL_SECTION_BEGIN( );
+    *data0 = RtcBkupRegisters[0];
+    *data1 = RtcBkupRegisters[1];
+    CRITICAL_SECTION_END( );
 }
 
 void RtcProcess( void )

src/system/systime.c

@@ -32,7 +32,7 @@
 #define END_OF_FEBRUARY_NORM                         59 //31+28
 #define END_OF_JULY_NORM                            212 //31+28+...
 
-#define UNIX_YEAR                                    68 //68 is leap year
+#define UNIX_YEAR                                    68 //1968 is leap year
 
 //UNIX time 0 = start at 01:00:00, 01/01/1970
 #define UNIX_HOUR_OFFSET                            ( ( TM_DAYS_IN_LEAP_YEAR + TM_DAYS_IN_YEAR ) * TM_SECONDS_IN_1DAY )
@@ -44,8 +44,8 @@
 #define  DAYS_IN_MONTH_CORRECTION_LEAP              ( (uint32_t )0x445550 )
 
 
-/* 1461 = 366 + 365 + 365 + 365 */
-#define DIV_1461( X )                               ( ( ( X ) * 91867 + 22750 ) >> 25 )
+/* 365.25 = (366 + 365 + 365 + 365)/4 */
+#define DIV_365_25( X )                               ( ( ( X ) * 91867 + 22750 ) >> 25 )
 
 #define DIV_APPROX_86400( X )                       ( ( ( X ) >> 18 ) + ( ( X ) >> 17 ) )
 
@@ -71,15 +71,6 @@ static void CalendarDiv86400( uint32_t in, uint32_t* out, uint32_t* remainder );
 static uint32_t CalendarDiv61( uint32_t in );
 static void CalendarDiv60( uint32_t in, uint32_t* out, uint32_t* remainder );
 
-/*!
- * \brief This is the time difference between the calendar time and UNIX time.
- */
-static SysTime_t DeltaTime =
-{
-    .Seconds = 0,
-    .SubSeconds = 0
-};
-
 const char *WeekDayString[]={ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
 
 SysTime_t SysTimeAdd( SysTime_t a, SysTime_t b )
@@ -112,33 +103,47 @@ SysTime_t SysTimeSub( SysTime_t a, SysTime_t b )
 
 void SysTimeSet( SysTime_t sysTime )
 {
+    SysTime_t deltaTime;
+  
     SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
 
     calendarTime.Seconds = RtcGetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
 
     // sysTime is epoch
-    DeltaTime = SysTimeSub( sysTime, calendarTime );
+    deltaTime = SysTimeSub( sysTime, calendarTime );
 
-    RtcBkupWrite( DeltaTime.Seconds, ( uint32_t )DeltaTime.SubSeconds );
+    RtcBkupWrite( deltaTime.Seconds, ( uint32_t )deltaTime.SubSeconds );
 }
 
 SysTime_t SysTimeGet( void )
 {
     SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
     SysTime_t sysTime = { .Seconds = 0, .SubSeconds = 0 };
+    SysTime_t deltaTime;
 
     calendarTime.Seconds = RtcGetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
 
-    RtcBkupRead( &DeltaTime.Seconds, ( uint32_t* )&DeltaTime.SubSeconds );
+    RtcBkupRead( &deltaTime.Seconds, ( uint32_t* )&deltaTime.SubSeconds );
 
-    sysTime = SysTimeAdd( DeltaTime, calendarTime );
+    sysTime = SysTimeAdd( deltaTime, calendarTime );
 
     return sysTime;
 }
 
+SysTime_t SysTimeGetMcuTime( void )
+{
+    SysTime_t calendarTime = { .Seconds = 0, .SubSeconds = 0 };
+
+    calendarTime.Seconds = RtcGetCalendarTime( ( uint16_t* )&calendarTime.SubSeconds );
+
+    return calendarTime;
+}
+
 uint32_t SysTime2Ms( SysTime_t sysTime )
 {
-    SysTime_t calendarTime = SysTimeSub( sysTime, DeltaTime );
+    SysTime_t deltaTime;
+    RtcBkupRead( &deltaTime.Seconds, ( uint32_t* )&deltaTime.SubSeconds );
+    SysTime_t calendarTime = SysTimeSub( sysTime, deltaTime );
     return calendarTime.Seconds * 1000 + calendarTime.SubSeconds;
 }
 
@@ -201,7 +206,7 @@ void SysTimeLocalTime( const uint32_t timestamp, struct tm *localtime )
     localtime->tm_hour = ( uint8_t )divOut;
 
     // Calculates year
-    localtime->tm_year = DIV_1461( days );
+    localtime->tm_year = DIV_365_25( days );
     days-= DIVC_BY_4( ( TM_DAYS_IN_YEAR * 3 + TM_DAYS_IN_LEAP_YEAR ) * localtime->tm_year );
 
     localtime->tm_yday = days;
@@ -225,26 +230,6 @@ void SysTimeLocalTime( const uint32_t timestamp, struct tm *localtime )
     localtime->tm_isdst = -1;
 }
 
-void SysTimeGetStr( char dateTimeString[DATE_TIME_STR_LEN] )
-{
-    SysTime_t sysTime;
-    struct tm dateTime;
-
-    sysTime = SysTimeGet( );
-    SysTimeLocalTime( sysTime.Seconds, &dateTime );
-
-    snprintf( dateTimeString,
-              DATE_TIME_STR_LEN,
-              "it's %02dh%02dm%02d on %s %02d/%02d/%04d",
-              dateTime.tm_hour,
-              dateTime.tm_min,
-              dateTime.tm_sec,
-              WeekDayString[dateTime.tm_wday],
-              dateTime.tm_mday,
-              dateTime.tm_mon,
-              dateTime.tm_year + 1900 );
-}
-
 static uint32_t CalendarGetMonth( uint32_t days, uint32_t year )
 {
     uint32_t month;

src/system/systime.h

@@ -76,11 +76,6 @@ extern "C"
  */
 #define UNIX_GPS_EPOCH_OFFSET                       315964800
 
-/*!
- * \brief Size of the string returned by SysTimeGetStr
- */
-#define DATE_TIME_STR_LEN                           32
-
 /*!
  * \brief Structure holding the system time in seconds and milliseconds.
  */
@@ -124,6 +119,13 @@ void SysTimeSet( SysTime_t sysTime );
  */
 SysTime_t SysTimeGet( void );
 
+/*!
+ * \brief Gets current MCU system time
+ *
+ * \retval sysTime    Current seconds/sub-seconds since Mcu started
+ */
+SysTime_t SysTimeGetMcuTime( void );
+
 /*!
  * Converts the given SysTime to the equivalent RTC value in milliseconds
  *
@@ -150,13 +152,6 @@ uint32_t SysTimeMkTime( const struct tm* localtime );
  */
 void SysTimeLocalTime( const uint32_t timestamp, struct tm *localtime );
 
-/*!
- * \brief Decodes the strFormat and posts it to the circular queue for printing
- *
- * \param [OUT]:  string String buffer pointer.
- */
-void SysTimeGetStr( char dateTimeSring[DATE_TIME_STR_LEN] );
-
 #ifdef __cplusplus
 }
 #endif