Skip to content

Commit ef5ba67

Browse files
committed
Issue #1061 - Fixed TimerTime_t usage instead of uint32_t
1 parent 88364c5 commit ef5ba67

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/mac/LoRaMacClassB.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ void LoRaMacClassBDeviceTimeAns( void )
16821682
#ifdef LORAMAC_CLASSB_ENABLED
16831683

16841684
SysTime_t nextBeacon = SysTimeGet( );
1685-
uint32_t currentTimeMs = SysTimeToMs( nextBeacon );
1685+
TimerTime_t currentTimeMs = SysTimeToMs( nextBeacon );
16861686

16871687
nextBeacon.Seconds = nextBeacon.Seconds + ( 128 - ( nextBeacon.Seconds % 128 ) );
16881688
nextBeacon.SubSeconds = 0;

src/system/systime.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ SysTime_t SysTimeGetMcuTime( void )
142142
return calendarTime;
143143
}
144144

145-
uint32_t SysTimeToMs( SysTime_t sysTime )
145+
TimerTime_t SysTimeToMs( SysTime_t sysTime )
146146
{
147147
uint32_t seconds;
148148
uint32_t subSeconds;
@@ -153,10 +153,10 @@ uint32_t SysTimeToMs( SysTime_t sysTime )
153153

154154
SysTime_t calendarTime = SysTimeSub( sysTime, deltaTime );
155155

156-
return calendarTime.Seconds * 1000 + calendarTime.SubSeconds;
156+
return ( TimerTime_t )( calendarTime.Seconds * 1000 + calendarTime.SubSeconds );
157157
}
158158

159-
SysTime_t SysTimeFromMs( uint32_t timeMs )
159+
SysTime_t SysTimeFromMs( TimerTime_t timeMs )
160160
{
161161
uint32_t seconds = timeMs / 1000;
162162
uint32_t subSeconds = timeMs - seconds * 1000;

src/system/systime.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ extern "C"
3232

3333
#include <stdint.h>
3434
#include "time.h"
35+
#include "timer.h"
3536

3637
/*!
3738
* \brief Days, Hours, Minutes and seconds of systime.h
@@ -134,7 +135,7 @@ SysTime_t SysTimeGetMcuTime( void );
134135
*
135136
* \retval timeMs The RTC converted time value in ms
136137
*/
137-
uint32_t SysTimeToMs( SysTime_t sysTime );
138+
TimerTime_t SysTimeToMs( SysTime_t sysTime );
138139

139140
/*!
140141
* Converts the given RTC value in milliseconds to the equivalent SysTime
@@ -143,7 +144,7 @@ uint32_t SysTimeToMs( SysTime_t sysTime );
143144
*
144145
* \retval sysTime Converted system time
145146
*/
146-
SysTime_t SysTimeFromMs( uint32_t timeMs );
147+
SysTime_t SysTimeFromMs( TimerTime_t timeMs );
147148

148149
/*!
149150
* \brief Convert a calendar time into time since UNIX epoch as a uint32_t.

0 commit comments

Comments
 (0)