Issue #1349 - Fixed Rx windows timer handling

mluis1 · mluis1 · commit e5076e13be49 · 2022-09-22T14:43:15.000+02:00
diff --git a/src/mac/LoRaMac.c b/src/mac/LoRaMac.c
@@ -808,11 +808,15 @@ static void ProcessRadioTxDone( void )
     {
         Radio.Sleep( );
     }
+
     // Setup timers
-    TimerSetValue( &MacCtx.RxWindowTimer1, MacCtx.RxWindow1Delay );
+    CRITICAL_SECTION_BEGIN( );
+    uint32_t offset = TimerGetCurrentTime( ) - TxDoneParams.CurTime;
+    TimerSetValue( &MacCtx.RxWindowTimer1, MacCtx.RxWindow1Delay - offset );
     TimerStart( &MacCtx.RxWindowTimer1 );
-    TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay );
+    TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay - offset );
     TimerStart( &MacCtx.RxWindowTimer2 );
+    CRITICAL_SECTION_END( );
 
     if( MacCtx.NodeAckRequested == true )
     {

Original file line number	Diff line number	Diff line change
`@@ -808,11 +808,15 @@ static void ProcessRadioTxDone( void )`
`808`	`808`	`{`
`809`	`809`	`Radio.Sleep( );`
`810`	`810`	`}`
	`811`	`+`
`811`	`812`	`// Setup timers`
`812`		`- TimerSetValue( &MacCtx.RxWindowTimer1, MacCtx.RxWindow1Delay );`
	`813`	`+ CRITICAL_SECTION_BEGIN( );`
	`814`	`+ uint32_t offset = TimerGetCurrentTime( ) - TxDoneParams.CurTime;`
	`815`	`+ TimerSetValue( &MacCtx.RxWindowTimer1, MacCtx.RxWindow1Delay - offset );`
`813`	`816`	`TimerStart( &MacCtx.RxWindowTimer1 );`
`814`		`- TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay );`
	`817`	`+ TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay - offset );`
`815`	`818`	`TimerStart( &MacCtx.RxWindowTimer2 );`
	`819`	`+ CRITICAL_SECTION_END( );`
`816`	`820`
`817`	`821`	`if( MacCtx.NodeAckRequested == true )`
`818`	`822`	`{`