Issue #559 - Fix previous correction. It introduced an issue when setting FSK modem in continuous FSK Rx mode.

mluis1 · mluis1 · commit 156b1b96e2ff · 2020-03-17T09:06:43.000+01:00
Update radio SX1272 and SX1276 to not start sync word timeout in case of continuous FSK Rx.
The sync word timeout is now only started in single FSK Rx mode
diff --git a/src/radio/sx1272/sx1272.c b/src/radio/sx1272/sx1272.c
@@ -868,8 +868,11 @@ void SX1272SetRx( uint32_t timeout )
     {
         SX1272SetOpMode( RF_OPMODE_RECEIVER );
 
-        TimerSetValue( &RxTimeoutSyncWord, SX1272.Settings.Fsk.RxSingleTimeout );
-        TimerStart( &RxTimeoutSyncWord );
+        if( rxContinuous == false )
+        {
+            TimerSetValue( &RxTimeoutSyncWord, SX1272.Settings.Fsk.RxSingleTimeout );
+            TimerStart( &RxTimeoutSyncWord );
+        }
     }
     else
     {
@@ -1210,7 +1213,6 @@ void SX1272OnTimeoutIrq( void* context )
             {
                 // Continuous mode restart Rx chain
                 SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                TimerStart( &RxTimeoutSyncWord );
             }
             else
             {
@@ -1296,7 +1298,6 @@ void SX1272OnDio0Irq( void* context )
                         {
                             // Continuous mode restart Rx chain
                             SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                            TimerStart( &RxTimeoutSyncWord );
                         }
 
                         if( ( RadioEvents != NULL ) && ( RadioEvents->RxError != NULL ) )
@@ -1342,7 +1343,6 @@ void SX1272OnDio0Irq( void* context )
                 {
                     // Continuous mode restart Rx chain
                     SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                    TimerStart( &RxTimeoutSyncWord );
                 }
 
                 if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )
diff --git a/src/radio/sx1276/sx1276.c b/src/radio/sx1276/sx1276.c
@@ -1022,8 +1022,11 @@ void SX1276SetRx( uint32_t timeout )
     {
         SX1276SetOpMode( RF_OPMODE_RECEIVER );
 
-        TimerSetValue( &RxTimeoutSyncWord, SX1276.Settings.Fsk.RxSingleTimeout );
-        TimerStart( &RxTimeoutSyncWord );
+        if( rxContinuous == false )
+        {
+            TimerSetValue( &RxTimeoutSyncWord, SX1276.Settings.Fsk.RxSingleTimeout );
+            TimerStart( &RxTimeoutSyncWord );
+        }
     }
     else
     {
@@ -1371,7 +1374,6 @@ void SX1276OnTimeoutIrq( void* context )
             {
                 // Continuous mode restart Rx chain
                 SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                TimerStart( &RxTimeoutSyncWord );
             }
             else
             {
@@ -1460,7 +1462,6 @@ void SX1276OnDio0Irq( void* context )
                         {
                             // Continuous mode restart Rx chain
                             SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                            TimerStart( &RxTimeoutSyncWord );
                         }
 
                         if( ( RadioEvents != NULL ) && ( RadioEvents->RxError != NULL ) )
@@ -1506,7 +1507,6 @@ void SX1276OnDio0Irq( void* context )
                 {
                     // Continuous mode restart Rx chain
                     SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) | RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );
-                    TimerStart( &RxTimeoutSyncWord );
                 }
 
                 if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )

Original file line number	Diff line number	Diff line change
`@@ -868,8 +868,11 @@ void SX1272SetRx( uint32_t timeout )`
`868`	`868`	`{`
`869`	`869`	`SX1272SetOpMode( RF_OPMODE_RECEIVER );`
`870`	`870`
`871`		`- TimerSetValue( &RxTimeoutSyncWord, SX1272.Settings.Fsk.RxSingleTimeout );`
`872`		`- TimerStart( &RxTimeoutSyncWord );`
	`871`	`+ if( rxContinuous == false )`
	`872`	`+ {`
	`873`	`+ TimerSetValue( &RxTimeoutSyncWord, SX1272.Settings.Fsk.RxSingleTimeout );`
	`874`	`+ TimerStart( &RxTimeoutSyncWord );`
	`875`	`+ }`
`873`	`876`	`}`
`874`	`877`	`else`
`875`	`878`	`{`
`@@ -1210,7 +1213,6 @@ void SX1272OnTimeoutIrq( void* context )`
`1210`	`1213`	`{`
`1211`	`1214`	`// Continuous mode restart Rx chain`
`1212`	`1215`	`SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1213`		`- TimerStart( &RxTimeoutSyncWord );`
`1214`	`1216`	`}`
`1215`	`1217`	`else`
`1216`	`1218`	`{`
`@@ -1296,7 +1298,6 @@ void SX1272OnDio0Irq( void* context )`
`1296`	`1298`	`{`
`1297`	`1299`	`// Continuous mode restart Rx chain`
`1298`	`1300`	`SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1299`		`- TimerStart( &RxTimeoutSyncWord );`
`1300`	`1301`	`}`
`1301`	`1302`
`1302`	`1303`	`if( ( RadioEvents != NULL ) && ( RadioEvents->RxError != NULL ) )`
`@@ -1342,7 +1343,6 @@ void SX1272OnDio0Irq( void* context )`
`1342`	`1343`	`{`
`1343`	`1344`	`// Continuous mode restart Rx chain`
`1344`	`1345`	`SX1272Write( REG_RXCONFIG, SX1272Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1345`		`- TimerStart( &RxTimeoutSyncWord );`
`1346`	`1346`	`}`
`1347`	`1347`
`1348`	`1348`	`if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )`
Original file line number	Diff line number	Diff line change
`@@ -1022,8 +1022,11 @@ void SX1276SetRx( uint32_t timeout )`
`1022`	`1022`	`{`
`1023`	`1023`	`SX1276SetOpMode( RF_OPMODE_RECEIVER );`
`1024`	`1024`
`1025`		`- TimerSetValue( &RxTimeoutSyncWord, SX1276.Settings.Fsk.RxSingleTimeout );`
`1026`		`- TimerStart( &RxTimeoutSyncWord );`
	`1025`	`+ if( rxContinuous == false )`
	`1026`	`+ {`
	`1027`	`+ TimerSetValue( &RxTimeoutSyncWord, SX1276.Settings.Fsk.RxSingleTimeout );`
	`1028`	`+ TimerStart( &RxTimeoutSyncWord );`
	`1029`	`+ }`
`1027`	`1030`	`}`
`1028`	`1031`	`else`
`1029`	`1032`	`{`
`@@ -1371,7 +1374,6 @@ void SX1276OnTimeoutIrq( void* context )`
`1371`	`1374`	`{`
`1372`	`1375`	`// Continuous mode restart Rx chain`
`1373`	`1376`	`SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1374`		`- TimerStart( &RxTimeoutSyncWord );`
`1375`	`1377`	`}`
`1376`	`1378`	`else`
`1377`	`1379`	`{`
`@@ -1460,7 +1462,6 @@ void SX1276OnDio0Irq( void* context )`
`1460`	`1462`	`{`
`1461`	`1463`	`// Continuous mode restart Rx chain`
`1462`	`1464`	`SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1463`		`- TimerStart( &RxTimeoutSyncWord );`
`1464`	`1465`	`}`
`1465`	`1466`
`1466`	`1467`	`if( ( RadioEvents != NULL ) && ( RadioEvents->RxError != NULL ) )`
`@@ -1506,7 +1507,6 @@ void SX1276OnDio0Irq( void* context )`
`1506`	`1507`	`{`
`1507`	`1508`	`// Continuous mode restart Rx chain`
`1508`	`1509`	`SX1276Write( REG_RXCONFIG, SX1276Read( REG_RXCONFIG ) \| RF_RXCONFIG_RESTARTRXWITHOUTPLLLOCK );`
`1509`		`- TimerStart( &RxTimeoutSyncWord );`
`1510`	`1510`	`}`
`1511`	`1511`
`1512`	`1512`	`if( ( RadioEvents != NULL ) && ( RadioEvents->RxDone != NULL ) )`