Merge bd990f7bd8 into ad0502685e

Middlewares/Third_Party/LoRaWAN/Mac/LoRaMac.c

@@ -1017,12 +1017,16 @@ static void ProcessRadioTxDone( void )
         Radio.Sleep( );
     }
 #if ( !defined(DISABLE_LORAWAN_RX_WINDOW) || (DISABLE_LORAWAN_RX_WINDOW == 0) )
+    // Setup timers
     // Setup timers
     CRITICAL_SECTION_BEGIN( );
-    uint32_t offset = TimerGetCurrentTime( ) - TxDoneParams.CurTime;
+    uint32_t cur_time = TimerGetCurrentTime( );
-    TimerSetValue( &MacCtx.RxWindowTimer1, MacCtx.RxWindow1Delay - offset );
+    uint32_t offset = (cur_time >= TxDoneParams.CurTime) ? (cur_time - TxDoneParams.CurTime) : (cur_time+ (0XFFFFFFFF - TxDoneParams.CurTime + 1));
+    uint32_t value1 = (MacCtx.RxWindow1Delay > offset) ? (MacCtx.RxWindow1Delay - offset) : MacCtx.RxWindow1Delay;
+    TimerSetValue( &MacCtx.RxWindowTimer1, value1 );
     TimerStart( &MacCtx.RxWindowTimer1 );
-    TimerSetValue( &MacCtx.RxWindowTimer2, MacCtx.RxWindow2Delay - offset );
+    uint32_t value2 = (MacCtx.RxWindow2Delay > offset) ? (MacCtx.RxWindow2Delay - offset) : MacCtx.RxWindow2Delay;
+    TimerSetValue( &MacCtx.RxWindowTimer2, value2 );
     TimerStart( &MacCtx.RxWindowTimer2 );
     CRITICAL_SECTION_END( );
 #else

Projects/Release_Notes.html

@@ -78,7 +78,7 @@ series</li>
 <div class="collapse">
 <input type="checkbox" id="collapse-section5" checked aria-hidden="true">
 <label for="collapse-section5" aria-hidden="true"><strong>V1.3.1 /
-29-November-2024</strong></label>
+20-December-2024</strong></label>
 <div>
 <h2 id="main-changes">Main Changes</h2>
 <h3 id="patch-release">Patch Release</h3>
@@ -124,7 +124,8 @@ class="icon-st-update"></span></td>
 </tr>
 <tr>
 <td style="text-align: left;">NUCLEO-WL55JC</td>
-<td style="text-align: left;">Demonstrations</td>
+<td style="text-align: left;">Demonstrations <span
+class="icon-st-update"></span></td>
 <td style="text-align: left;">Projects\NUCLEO-WL55JC\Demonstrations</td>
 </tr>
 <tr>
@@ -186,6 +187,14 @@ RTC</li>
 <li>Set the ulExpectedIdleTime flag before entering in low power mode in
 PreSleepProcessing</li>
 </ul></li>
+<li><strong>Applications/LoRaWAN/LoRaWAN_AT_Slave</strong>
+<ul>
+<li>Update CubeMonitor RF test panel</li>
+</ul></li>
+<li><strong>Applications/LoRaWAN/LoRaWAN_AT_Slave_DualCore</strong>
+<ul>
+<li>Update CubeMonitor RF test panel</li>
+</ul></li>
 <li><strong>Applications/LoRaWAN_FUOTA_DualCore</strong>
 <ul>
 <li>Fix compilation on Linux host due to lower case letters used in file
@@ -201,6 +210,10 @@ names</li>
 <li>Fix compilation on Linux host due to lower case letters used in file
 names</li>
 </ul></li>
+<li><strong>Demonstrations/LocalNetwork/LocalNetwork_Concentrator/</strong>
+<ul>
+<li>Update CubeMonitor RF demo panel</li>
+</ul></li>
 <li><strong>Examples/PWR/PWR_STOP2_RTC</strong>
 <ul>
 <li>Fix PWR_STOP2_RTC test due to uninitialized RCC_OscInitStruct
@@ -223,11 +236,16 @@ struct</li>
 <li><strong>Applications/LoRaWAN_FUOTA_DualCore_ExtFlash</strong>
 <ul>
 <li>Fix compilation on Linux host due to lower case letters used in file
-names<br />
+names</li>
-</li>
+</ul></li>
+<li><strong>Applications/LoRaWAN/LoRaWAN_AT_Slave</strong>
+<ul>
+<li>Update CubeMonitor RF test panel</li>
 </ul></li>
 </ul></li>
 </ul>
+<p><br />
+</p>
 <h2 id="known-limitations">Known Limitations</h2>
 <ul>
 <li><strong>LL/HAL</strong>