TimerGetElapsedTime: made aware of t==0 situation, removed ternaries

mvds00 · mvds00 · commit 2cac96e207d4 · 2018-12-18T13:55:08.000+01:00
diff --git a/src/mac/region/RegionAS923.c b/src/mac/region/RegionAS923.c
@@ -917,7 +917,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionAU915.c b/src/mac/region/RegionAU915.c
@@ -917,7 +917,7 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
         }
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionCN470.c b/src/mac/region/RegionCN470.c
@@ -734,7 +734,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[5] = 0xFFFF;
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionCN779.c b/src/mac/region/RegionCN779.c
@@ -860,7 +860,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionCommon.c b/src/mac/region/RegionCommon.c
@@ -169,8 +169,8 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*
     {
         if( joined == false )
         {
-            TimerTime_t elapsedJoin = ( bands[i].LastJoinTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );
-            TimerTime_t elapsedTx = ( bands[i].LastTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastTxDoneTime );
+            TimerTime_t elapsedJoin = TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );
+            TimerTime_t elapsedTx = TimerGetElapsedTime( bands[i].LastTxDoneTime );
             TimerTime_t txDoneTime =  MAX( elapsedJoin,
                                         ( dutyCycle == true ) ? elapsedTx : 0 );
 
@@ -187,7 +187,7 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*
         {
             if( dutyCycle == true )
             {
-                TimerTime_t elapsed = ( bands[i].LastTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastTxDoneTime );
+                TimerTime_t elapsed = TimerGetElapsedTime( bands[i].LastTxDoneTime );
                 if( bands[i].TimeOff <= elapsed )
                 {
                     bands[i].TimeOff = 0;
diff --git a/src/mac/region/RegionEU433.c b/src/mac/region/RegionEU433.c
@@ -860,7 +860,7 @@ LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionEU868.c b/src/mac/region/RegionEU868.c
@@ -892,7 +892,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionIN865.c b/src/mac/region/RegionIN865.c
@@ -885,7 +885,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionKR920.c b/src/mac/region/RegionKR920.c
@@ -854,7 +854,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 ) + LC( 3 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
@@ -851,7 +851,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_
         NvmCtx.ChannelsMask[0] |= LC( 1 ) + LC( 2 );
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/mac/region/RegionUS915.c b/src/mac/region/RegionUS915.c
@@ -1009,7 +1009,7 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
         }
     }
 
-    TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );
+    TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
     if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
diff --git a/src/system/timer.c b/src/system/timer.c
@@ -351,6 +351,10 @@ TimerTime_t TimerGetCurrentTime( void )
 
 TimerTime_t TimerGetElapsedTime( TimerTime_t past )
 {
+    if ( past == 0 )
+    {
+        return 0;
+    }
     uint32_t nowInTicks = RtcGetTimerValue( );
     uint32_t pastInTicks = RtcMs2Tick( past );
 
diff --git a/src/system/timer.h b/src/system/timer.h
@@ -121,6 +121,8 @@ TimerTime_t TimerGetCurrentTime( void );
 /*!
  * \brief Return the Time elapsed since a fix moment in Time
  *
+ * \remark TimerGetElapsedTime will return 0 for argument 0.
+ *
  * \param [IN] past         fix moment in Time
  * \retval time             returns elapsed time
  */

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_`
`917`	`917`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 );`
`918`	`918`	`}`
`919`	`919`
`920`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`920`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`921`	`921`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`922`	`922`	`{`
`923`	`923`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_`
`734`	`734`	`NvmCtx.ChannelsMask[5] = 0xFFFF;`
`735`	`735`	`}`
`736`	`736`
`737`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`737`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`738`	`738`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`739`	`739`	`{`
`740`	`740`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_`
`860`	`860`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`861`	`861`	`}`
`862`	`862`
`863`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`863`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`864`	`864`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`865`	`865`	`{`
`866`	`866`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*`
`169`	`169`	`{`
`170`	`170`	`if( joined == false )`
`171`	`171`	`{`
`172`		`- TimerTime_t elapsedJoin = ( bands[i].LastJoinTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );`
`173`		`- TimerTime_t elapsedTx = ( bands[i].LastTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastTxDoneTime );`
	`172`	`+ TimerTime_t elapsedJoin = TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );`
	`173`	`+ TimerTime_t elapsedTx = TimerGetElapsedTime( bands[i].LastTxDoneTime );`
`174`	`174`	`TimerTime_t txDoneTime = MAX( elapsedJoin,`
`175`	`175`	`( dutyCycle == true ) ? elapsedTx : 0 );`
`176`	`176`
`@@ -187,7 +187,7 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*`
`187`	`187`	`{`
`188`	`188`	`if( dutyCycle == true )`
`189`	`189`	`{`
`190`		`- TimerTime_t elapsed = ( bands[i].LastTxDoneTime == 0 ) ? 0 : TimerGetElapsedTime( bands[i].LastTxDoneTime );`
	`190`	`+ TimerTime_t elapsed = TimerGetElapsedTime( bands[i].LastTxDoneTime );`
`191`	`191`	`if( bands[i].TimeOff <= elapsed )`
`192`	`192`	`{`
`193`	`193`	`bands[i].TimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -892,7 +892,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_`
`892`	`892`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`893`	`893`	`}`
`894`	`894`
`895`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`895`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`896`	`896`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`897`	`897`	`{`
`898`	`898`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -885,7 +885,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_`
`885`	`885`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`886`	`886`	`}`
`887`	`887`
`888`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`888`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`889`	`889`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`890`	`890`	`{`
`891`	`891`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_`
`854`	`854`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 ) + LC( 3 );`
`855`	`855`	`}`
`856`	`856`
`857`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`857`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`858`	`858`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`859`	`859`	`{`
`860`	`860`	`// Reset Aggregated time off`
Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_`
`851`	`851`	`NvmCtx.ChannelsMask[0] \|= LC( 1 ) + LC( 2 );`
`852`	`852`	`}`
`853`	`853`
`854`		`- TimerTime_t elapsed = ( ( nextChanParams->LastAggrTx == 0 ) ) ? 0 : TimerGetElapsedTime( nextChanParams->LastAggrTx );`
	`854`	`+ TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`855`	`855`	`if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`856`	`856`	`{`
`857`	`857`	`// Reset Aggregated time off`