Merge pull request #610 from thingsconnected/pullreq1.1

mluis1 · web-flow · commit 5c75cda68940 · 2018-12-18T14:00:20.000+01:00
Make uses of TimerGetElapsedTime(t) aware of t==0 situation
diff --git a/src/mac/region/RegionAS923.c b/src/mac/region/RegionAS923.c
@@ -918,7 +918,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionAU915.c b/src/mac/region/RegionAU915.c
@@ -918,7 +918,7 @@ LoRaMacStatus_t RegionAU915NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionCN470.c b/src/mac/region/RegionCN470.c
@@ -735,7 +735,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionCN779.c b/src/mac/region/RegionCN779.c
@@ -861,7 +861,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionCommon.c b/src/mac/region/RegionCommon.c
@@ -169,8 +169,10 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*
     {
         if( joined == false )
         {
-            TimerTime_t txDoneTime =  MAX( TimerGetElapsedTime( bands[i].LastJoinTxDoneTime ),
-                                        ( dutyCycle == true ) ? TimerGetElapsedTime( bands[i].LastTxDoneTime ) : 0 );
+            TimerTime_t elapsedJoin = TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );
+            TimerTime_t elapsedTx = TimerGetElapsedTime( bands[i].LastTxDoneTime );
+            TimerTime_t txDoneTime =  MAX( elapsedJoin,
+                                        ( dutyCycle == true ) ? elapsedTx : 0 );
 
             if( bands[i].TimeOff <= txDoneTime )
             {
diff --git a/src/mac/region/RegionEU433.c b/src/mac/region/RegionEU433.c
@@ -861,7 +861,7 @@ LoRaMacStatus_t RegionEU433NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionEU868.c b/src/mac/region/RegionEU868.c
@@ -893,7 +893,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionIN865.c b/src/mac/region/RegionIN865.c
@@ -886,7 +886,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionKR920.c b/src/mac/region/RegionKR920.c
@@ -855,7 +855,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
@@ -852,7 +852,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
diff --git a/src/mac/region/RegionUS915.c b/src/mac/region/RegionUS915.c
@@ -1010,7 +1010,7 @@ LoRaMacStatus_t RegionUS915NextChannel( NextChanParams_t* nextChanParams, uint8_
     }
 
     TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );
-    if( nextChanParams->AggrTimeOff <= elapsed )
+    if( ( nextChanParams->LastAggrTx == 0 ) || ( nextChanParams->AggrTimeOff <= elapsed ) )
     {
         // Reset Aggregated time off
         *aggregatedTimeOff = 0;
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
`@@ -918,7 +918,7 @@ LoRaMacStatus_t RegionAS923NextChannel( NextChanParams_t* nextChanParams, uint8_`
`918`	`918`	`}`
`919`	`919`
`920`	`920`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`921`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`921`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`922`	`922`	`{`
`923`	`923`	`// Reset Aggregated time off`
`924`	`924`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ LoRaMacStatus_t RegionCN470NextChannel( NextChanParams_t* nextChanParams, uint8_`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`738`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`738`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`739`	`739`	`{`
`740`	`740`	`// Reset Aggregated time off`
`741`	`741`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -861,7 +861,7 @@ LoRaMacStatus_t RegionCN779NextChannel( NextChanParams_t* nextChanParams, uint8_`
`861`	`861`	`}`
`862`	`862`
`863`	`863`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`864`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`864`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`865`	`865`	`{`
`866`	`866`	`// Reset Aggregated time off`
`867`	`867`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,10 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, bool dutyCycle, Band_t*`
`169`	`169`	`{`
`170`	`170`	`if( joined == false )`
`171`	`171`	`{`
`172`		`- TimerTime_t txDoneTime = MAX( TimerGetElapsedTime( bands[i].LastJoinTxDoneTime ),`
`173`		`- ( dutyCycle == true ) ? TimerGetElapsedTime( bands[i].LastTxDoneTime ) : 0 );`
	`172`	`+ TimerTime_t elapsedJoin = TimerGetElapsedTime( bands[i].LastJoinTxDoneTime );`
	`173`	`+ TimerTime_t elapsedTx = TimerGetElapsedTime( bands[i].LastTxDoneTime );`
	`174`	`+ TimerTime_t txDoneTime = MAX( elapsedJoin,`
	`175`	`+ ( dutyCycle == true ) ? elapsedTx : 0 );`
`174`	`176`
`175`	`177`	`if( bands[i].TimeOff <= txDoneTime )`
`176`	`178`	`{`
Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,7 @@ LoRaMacStatus_t RegionEU868NextChannel( NextChanParams_t* nextChanParams, uint8_`
`893`	`893`	`}`
`894`	`894`
`895`	`895`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`896`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`896`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`897`	`897`	`{`
`898`	`898`	`// Reset Aggregated time off`
`899`	`899`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ LoRaMacStatus_t RegionIN865NextChannel( NextChanParams_t* nextChanParams, uint8_`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`889`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`889`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`890`	`890`	`{`
`891`	`891`	`// Reset Aggregated time off`
`892`	`892`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ LoRaMacStatus_t RegionKR920NextChannel( NextChanParams_t* nextChanParams, uint8_`
`855`	`855`	`}`
`856`	`856`
`857`	`857`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`858`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`858`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`859`	`859`	`{`
`860`	`860`	`// Reset Aggregated time off`
`861`	`861`	`*aggregatedTimeOff = 0;`
Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@ LoRaMacStatus_t RegionRU864NextChannel( NextChanParams_t* nextChanParams, uint8_`
`852`	`852`	`}`
`853`	`853`
`854`	`854`	`TimerTime_t elapsed = TimerGetElapsedTime( nextChanParams->LastAggrTx );`
`855`		`- if( nextChanParams->AggrTimeOff <= elapsed )`
	`855`	`+ if( ( nextChanParams->LastAggrTx == 0 ) \|\| ( nextChanParams->AggrTimeOff <= elapsed ) )`
`856`	`856`	`{`
`857`	`857`	`// Reset Aggregated time off`
`858`	`858`	`*aggregatedTimeOff = 0;`