Change conditions in SetNextChannel.

Daniel Jäckle · Daniel Jäckle · commit dcc589f820f8 · 2016-04-29T16:37:29.000+02:00
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -1674,7 +1674,7 @@ static bool SetNextChannel( TimerTime_t* time )
 #endif
 
     // Update Aggregated duty cycle
-    if( AggregatedTimeOff < TimerGetElapsedTime( AggregatedLastTxDoneTime ) )
+    if( AggregatedTimeOff <= TimerGetElapsedTime( AggregatedLastTxDoneTime ) )
     {
         AggregatedTimeOff = 0;
 
@@ -1683,7 +1683,7 @@ static bool SetNextChannel( TimerTime_t* time )
         {
             if( DutyCycleOn == true )
             {
-                if( Bands[i].TimeOff < TimerGetElapsedTime( Bands[i].LastTxDoneTime ) )
+                if( Bands[i].TimeOff <= TimerGetElapsedTime( Bands[i].LastTxDoneTime ) )
                 {
                     Bands[i].TimeOff = 0;
                 }

Original file line number	Diff line number	Diff line change
`@@ -1674,7 +1674,7 @@ static bool SetNextChannel( TimerTime_t* time )`
`1674`	`1674`	`#endif`
`1675`	`1675`
`1676`	`1676`	`// Update Aggregated duty cycle`
`1677`		`- if( AggregatedTimeOff < TimerGetElapsedTime( AggregatedLastTxDoneTime ) )`
	`1677`	`+ if( AggregatedTimeOff <= TimerGetElapsedTime( AggregatedLastTxDoneTime ) )`
`1678`	`1678`	`{`
`1679`	`1679`	`AggregatedTimeOff = 0;`
`1680`	`1680`
`@@ -1683,7 +1683,7 @@ static bool SetNextChannel( TimerTime_t* time )`
`1683`	`1683`	`{`
`1684`	`1684`	`if( DutyCycleOn == true )`
`1685`	`1685`	`{`
`1686`		`- if( Bands[i].TimeOff < TimerGetElapsedTime( Bands[i].LastTxDoneTime ) )`
	`1686`	`+ if( Bands[i].TimeOff <= TimerGetElapsedTime( Bands[i].LastTxDoneTime ) )`
`1687`	`1687`	`{`
`1688`	`1688`	`Bands[i].TimeOff = 0;`
`1689`	`1689`	`}`