Issue #931 - Changed RegionCommonComputeSymbolTimeLoRa, RegionCommonComputeSymbolTimeFsk and RegionCommonComputeRxWindowParameters API implementations to use integer divisions instead of double division.

mluis1 · mluis1 · commit bc712078c1d9 · 2020-08-31T10:52:50.000+02:00
diff --git a/src/mac/region/RegionAS923.c b/src/mac/region/RegionAS923.c
@@ -579,22 +579,22 @@ bool RegionAS923ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionAS923ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, AS923_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAS923 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionAU915.c b/src/mac/region/RegionAU915.c
@@ -556,15 +556,15 @@ bool RegionAU915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionAU915ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, AU915_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAU915 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionAU915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionCN470.c b/src/mac/region/RegionCN470.c
@@ -452,15 +452,15 @@ bool RegionCN470ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionCN470ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, CN470_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN470 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionCN470RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionCN779.c b/src/mac/region/RegionCN779.c
@@ -474,22 +474,22 @@ bool RegionCN779ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionCN779ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, CN779_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN779 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionCommon.c b/src/mac/region/RegionCommon.c
@@ -45,6 +45,24 @@
 #define DUTY_CYCLE_TIME_PERIOD              3600000
 #endif
 
+/*!
+ * \brief Returns `N / D` rounded to the smallest integer value greater than or equal to `N / D`
+ *
+ * \warning when `D == 0`, the result is undefined
+ *
+ * \remark `N` and `D` can be signed or unsigned
+ *
+ * \param [IN] N the numerator, which can have any sign
+ * \param [IN] D the denominator, which can have any sign
+ * \retval N / D with any fractional part rounded to the smallest integer value greater than or equal to `N / D`
+ */
+#define DIV_CEIL( N, D )                                                       \
+    (                                                                          \
+        ( N > 0 ) ?                                                            \
+        ( ( ( N ) + ( D ) - 1 ) / ( D ) ) :                                    \
+        ( ( N ) / ( D ) )                                                      \
+    )
+
 static uint16_t GetDutyCycle( Band_t* band, bool joined, SysTime_t elapsedTimeSinceStartup )
 {
     uint16_t joinDutyCycle = RegionCommonGetJoinDc( elapsedTimeSinceStartup );
@@ -410,20 +428,22 @@ uint8_t RegionCommonLinkAdrReqVerifyParams( RegionCommonLinkAdrReqVerifyParams_t
     return status;
 }
 
-double RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidth )
+uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidthInHz )
 {
-    return ( ( double )( 1 << phyDr ) / ( double )bandwidth ) * 1000;
+    return ( 1 << phyDr ) * 1000000 / bandwidthInHz;
 }
 
-double RegionCommonComputeSymbolTimeFsk( uint8_t phyDr )
+uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDrInKbps )
 {
-    return ( 8.0 / ( double )phyDr ); // 1 symbol equals 1 byte
+    return 8000 / ( uint32_t )phyDrInKbps; // 1 symbol equals 1 byte
 }
 
-void RegionCommonComputeRxWindowParameters( double tSymbol, uint8_t minRxSymbols, uint32_t rxError, uint32_t wakeUpTime, uint32_t* windowTimeout, int32_t* windowOffset )
+void RegionCommonComputeRxWindowParameters( uint32_t tSymbolInUs, uint8_t minRxSymbols, uint32_t rxErrorInMs, uint32_t wakeUpTimeInMs, uint32_t* windowTimeoutInSymbols, int32_t* windowOffsetInMs )
 {
-    *windowTimeout = MAX( ( uint32_t )ceil( ( ( 2 * minRxSymbols - 8 ) * tSymbol + 2 * rxError ) / tSymbol ), minRxSymbols ); // Computed number of symbols
-    *windowOffset = ( int32_t )ceil( ( 4.0 * tSymbol ) - ( ( *windowTimeout * tSymbol ) / 2.0 ) - wakeUpTime );
+    *windowTimeoutInSymbols = MAX( DIV_CEIL( ( ( 2 * minRxSymbols - 8 ) * tSymbolInUs + 2 * ( rxErrorInMs * 1000 ) ),  tSymbolInUs ), minRxSymbols ); // Computed number of symbols
+    *windowOffsetInMs = ( int32_t )DIV_CEIL( ( int32_t )( 4 * tSymbolInUs ) -
+                                               ( int32_t )DIV_CEIL( ( *windowTimeoutInSymbols * tSymbolInUs ), 2 ) -
+                                               ( int32_t )( wakeUpTimeInMs * 1000 ), 1000 );
 }
 
 int8_t RegionCommonComputeTxPower( int8_t txPowerIndex, float maxEirp, float antennaGain )
diff --git a/src/mac/region/RegionCommon.h b/src/mac/region/RegionCommon.h
@@ -483,38 +483,36 @@ uint8_t RegionCommonLinkAdrReqVerifyParams( RegionCommonLinkAdrReqVerifyParams_t
  *
  * \param [IN] bandwidth Bandwidth to use.
  *
- * \retval Returns the symbol time.
+ * \retval Returns the symbol time in microseconds.
  */
-double RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidth );
+uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidthInHz );
 
 /*!
  * \brief Computes the symbol time for FSK modulation.
  *
  * \param [IN] phyDr Physical datarate to use.
  *
- * \param [IN] bandwidth Bandwidth to use.
- *
- * \retval Returns the symbol time.
+ * \retval Returns the symbol time in microseconds.
  */
-double RegionCommonComputeSymbolTimeFsk( uint8_t phyDr );
+uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDrInKbps );
 
 /*!
  * \brief Computes the RX window timeout and the RX window offset.
  *
- * \param [IN] tSymbol Symbol timeout.
+ * \param [IN] tSymbolInUs Symbol timeout.
  *
  * \param [IN] minRxSymbols Minimum required number of symbols to detect an Rx frame.
  *
- * \param [IN] rxError System maximum timing error of the receiver. In milliseconds
- *                     The receiver will turn on in a [-rxError : +rxError] ms interval around RxOffset.
+ * \param [IN] rxErrorInMs System maximum timing error of the receiver. In milliseconds
+ *                     The receiver will turn on in a [-rxErrorInMs : +rxErrorInMs] ms interval around RxOffset.
  *
- * \param [IN] wakeUpTime Wakeup time of the system.
+ * \param [IN] wakeUpTimeInMs Wakeup time of the system.
  *
- * \param [OUT] windowTimeout RX window timeout.
+ * \param [OUT] windowTimeoutInSymbols RX window timeout.
  *
- * \param [OUT] windowOffset RX window time offset to be applied to the RX delay.
+ * \param [OUT] windowOffsetInMs RX window time offset to be applied to the RX delay.
  */
-void RegionCommonComputeRxWindowParameters( double tSymbol, uint8_t minRxSymbols, uint32_t rxError, uint32_t wakeUpTime, uint32_t* windowTimeout, int32_t* windowOffset );
+void RegionCommonComputeRxWindowParameters( uint32_t tSymbolInUs, uint8_t minRxSymbols, uint32_t rxErrorInMs, uint32_t wakeUpTimeInMs, uint32_t* windowTimeoutInSymbols, int32_t* windowOffsetInMs );
 
 /*!
  * \brief Computes the txPower, based on the max EIRP and the antenna gain.
diff --git a/src/mac/region/RegionEU433.c b/src/mac/region/RegionEU433.c
@@ -474,22 +474,22 @@ bool RegionEU433ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionEU433ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, EU433_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU433 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionEU868.c b/src/mac/region/RegionEU868.c
@@ -505,22 +505,22 @@ bool RegionEU868ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionEU868ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, EU868_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU868 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionIN865.c b/src/mac/region/RegionIN865.c
@@ -500,22 +500,22 @@ bool RegionIN865ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionIN865ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, IN865_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsIN865 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionKR920.c b/src/mac/region/RegionKR920.c
@@ -494,15 +494,15 @@ bool RegionKR920ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionKR920ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, KR920_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsKR920 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
@@ -473,22 +473,22 @@ bool RegionRU864ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionRU864ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, RU864_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsRU864 );
 
     if( rxConfigParams->Datarate == DR_7 )
     { // FSK
-        tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesRU864[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesRU864[rxConfigParams->Datarate] );
     }
     else
     { // LoRa
-        tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesRU864[rxConfigParams->Datarate], BandwidthsRU864[rxConfigParams->Datarate] );
+        tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesRU864[rxConfigParams->Datarate], BandwidthsRU864[rxConfigParams->Datarate] );
     }
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionRU864RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )
diff --git a/src/mac/region/RegionUS915.c b/src/mac/region/RegionUS915.c
@@ -532,15 +532,15 @@ bool RegionUS915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )
 
 void RegionUS915ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )
 {
-    double tSymbol = 0.0;
+    uint32_t tSymbolInUs = 0;
 
     // Get the datarate, perform a boundary check
     rxConfigParams->Datarate = MIN( datarate, US915_RX_MAX_DATARATE );
     rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsUS915 );
 
-    tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesUS915[rxConfigParams->Datarate], BandwidthsUS915[rxConfigParams->Datarate] );
+    tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesUS915[rxConfigParams->Datarate], BandwidthsUS915[rxConfigParams->Datarate] );
 
-    RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
+    RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );
 }
 
 bool RegionUS915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )

Original file line number	Diff line number	Diff line change
`@@ -579,22 +579,22 @@ bool RegionAS923ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`579`	`579`
`580`	`580`	`void RegionAS923ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`581`	`581`	`{`
`582`		`- double tSymbol = 0.0;`
	`582`	`+ uint32_t tSymbolInUs = 0;`
`583`	`583`
`584`	`584`	`// Get the datarate, perform a boundary check`
`585`	`585`	`rxConfigParams->Datarate = MIN( datarate, AS923_RX_MAX_DATARATE );`
`586`	`586`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAS923 );`
`587`	`587`
`588`	`588`	`if( rxConfigParams->Datarate == DR_7 )`
`589`	`589`	`{ // FSK`
`590`		`- tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );`
	`590`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesAS923[rxConfigParams->Datarate] );`
`591`	`591`	`}`
`592`	`592`	`else`
`593`	`593`	`{ // LoRa`
`594`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );`
	`594`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAS923[rxConfigParams->Datarate], BandwidthsAS923[rxConfigParams->Datarate] );`
`595`	`595`	`}`
`596`	`596`
`597`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`597`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`598`	`598`	`}`
`599`	`599`
`600`	`600`	`bool RegionAS923RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -556,15 +556,15 @@ bool RegionAU915ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`556`	`556`
`557`	`557`	`void RegionAU915ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`558`	`558`	`{`
`559`		`- double tSymbol = 0.0;`
	`559`	`+ uint32_t tSymbolInUs = 0;`
`560`	`560`
`561`	`561`	`// Get the datarate, perform a boundary check`
`562`	`562`	`rxConfigParams->Datarate = MIN( datarate, AU915_RX_MAX_DATARATE );`
`563`	`563`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsAU915 );`
`564`	`564`
`565`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );`
	`565`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesAU915[rxConfigParams->Datarate], BandwidthsAU915[rxConfigParams->Datarate] );`
`566`	`566`
`567`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`567`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`bool RegionAU915RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -452,15 +452,15 @@ bool RegionCN470ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`452`	`452`
`453`	`453`	`void RegionCN470ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`454`	`454`	`{`
`455`		`- double tSymbol = 0.0;`
	`455`	`+ uint32_t tSymbolInUs = 0;`
`456`	`456`
`457`	`457`	`// Get the datarate, perform a boundary check`
`458`	`458`	`rxConfigParams->Datarate = MIN( datarate, CN470_RX_MAX_DATARATE );`
`459`	`459`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN470 );`
`460`	`460`
`461`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );`
	`461`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN470[rxConfigParams->Datarate], BandwidthsCN470[rxConfigParams->Datarate] );`
`462`	`462`
`463`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`463`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`bool RegionCN470RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -474,22 +474,22 @@ bool RegionCN779ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`474`	`474`
`475`	`475`	`void RegionCN779ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`476`	`476`	`{`
`477`		`- double tSymbol = 0.0;`
	`477`	`+ uint32_t tSymbolInUs = 0;`
`478`	`478`
`479`	`479`	`// Get the datarate, perform a boundary check`
`480`	`480`	`rxConfigParams->Datarate = MIN( datarate, CN779_RX_MAX_DATARATE );`
`481`	`481`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsCN779 );`
`482`	`482`
`483`	`483`	`if( rxConfigParams->Datarate == DR_7 )`
`484`	`484`	`{ // FSK`
`485`		`- tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );`
	`485`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesCN779[rxConfigParams->Datarate] );`
`486`	`486`	`}`
`487`	`487`	`else`
`488`	`488`	`{ // LoRa`
`489`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );`
	`489`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesCN779[rxConfigParams->Datarate], BandwidthsCN779[rxConfigParams->Datarate] );`
`490`	`490`	`}`
`491`	`491`
`492`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`492`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`bool RegionCN779RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -483,38 +483,36 @@ uint8_t RegionCommonLinkAdrReqVerifyParams( RegionCommonLinkAdrReqVerifyParams_t`
`483`	`483`	`*`
`484`	`484`	`* \param [IN] bandwidth Bandwidth to use.`
`485`	`485`	`*`
`486`		`- * \retval Returns the symbol time.`
	`486`	`+ * \retval Returns the symbol time in microseconds.`
`487`	`487`	`*/`
`488`		`-double RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidth );`
	`488`	`+uint32_t RegionCommonComputeSymbolTimeLoRa( uint8_t phyDr, uint32_t bandwidthInHz );`
`489`	`489`
`490`	`490`	`/*!`
`491`	`491`	`* \brief Computes the symbol time for FSK modulation.`
`492`	`492`	`*`
`493`	`493`	`* \param [IN] phyDr Physical datarate to use.`
`494`	`494`	`*`
`495`		`- * \param [IN] bandwidth Bandwidth to use.`
`496`		`- *`
`497`		`- * \retval Returns the symbol time.`
	`495`	`+ * \retval Returns the symbol time in microseconds.`
`498`	`496`	`*/`
`499`		`-double RegionCommonComputeSymbolTimeFsk( uint8_t phyDr );`
	`497`	`+uint32_t RegionCommonComputeSymbolTimeFsk( uint8_t phyDrInKbps );`
`500`	`498`
`501`	`499`	`/*!`
`502`	`500`	`* \brief Computes the RX window timeout and the RX window offset.`
`503`	`501`	`*`
`504`		`- * \param [IN] tSymbol Symbol timeout.`
	`502`	`+ * \param [IN] tSymbolInUs Symbol timeout.`
`505`	`503`	`*`
`506`	`504`	`* \param [IN] minRxSymbols Minimum required number of symbols to detect an Rx frame.`
`507`	`505`	`*`
`508`		`- * \param [IN] rxError System maximum timing error of the receiver. In milliseconds`
`509`		`- * The receiver will turn on in a [-rxError : +rxError] ms interval around RxOffset.`
	`506`	`+ * \param [IN] rxErrorInMs System maximum timing error of the receiver. In milliseconds`
	`507`	`+ * The receiver will turn on in a [-rxErrorInMs : +rxErrorInMs] ms interval around RxOffset.`
`510`	`508`	`*`
`511`		`- * \param [IN] wakeUpTime Wakeup time of the system.`
	`509`	`+ * \param [IN] wakeUpTimeInMs Wakeup time of the system.`
`512`	`510`	`*`
`513`		`- * \param [OUT] windowTimeout RX window timeout.`
	`511`	`+ * \param [OUT] windowTimeoutInSymbols RX window timeout.`
`514`	`512`	`*`
`515`		`- * \param [OUT] windowOffset RX window time offset to be applied to the RX delay.`
	`513`	`+ * \param [OUT] windowOffsetInMs RX window time offset to be applied to the RX delay.`
`516`	`514`	`*/`
`517`		`-void RegionCommonComputeRxWindowParameters( double tSymbol, uint8_t minRxSymbols, uint32_t rxError, uint32_t wakeUpTime, uint32_t* windowTimeout, int32_t* windowOffset );`
	`515`	`+void RegionCommonComputeRxWindowParameters( uint32_t tSymbolInUs, uint8_t minRxSymbols, uint32_t rxErrorInMs, uint32_t wakeUpTimeInMs, uint32_t* windowTimeoutInSymbols, int32_t* windowOffsetInMs );`
`518`	`516`
`519`	`517`	`/*!`
`520`	`518`	`* \brief Computes the txPower, based on the max EIRP and the antenna gain.`
Original file line number	Diff line number	Diff line change
`@@ -474,22 +474,22 @@ bool RegionEU433ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`474`	`474`
`475`	`475`	`void RegionEU433ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`476`	`476`	`{`
`477`		`- double tSymbol = 0.0;`
	`477`	`+ uint32_t tSymbolInUs = 0;`
`478`	`478`
`479`	`479`	`// Get the datarate, perform a boundary check`
`480`	`480`	`rxConfigParams->Datarate = MIN( datarate, EU433_RX_MAX_DATARATE );`
`481`	`481`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU433 );`
`482`	`482`
`483`	`483`	`if( rxConfigParams->Datarate == DR_7 )`
`484`	`484`	`{ // FSK`
`485`		`- tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );`
	`485`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU433[rxConfigParams->Datarate] );`
`486`	`486`	`}`
`487`	`487`	`else`
`488`	`488`	`{ // LoRa`
`489`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );`
	`489`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU433[rxConfigParams->Datarate], BandwidthsEU433[rxConfigParams->Datarate] );`
`490`	`490`	`}`
`491`	`491`
`492`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`492`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`bool RegionEU433RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -505,22 +505,22 @@ bool RegionEU868ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`505`	`505`
`506`	`506`	`void RegionEU868ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`507`	`507`	`{`
`508`		`- double tSymbol = 0.0;`
	`508`	`+ uint32_t tSymbolInUs = 0;`
`509`	`509`
`510`	`510`	`// Get the datarate, perform a boundary check`
`511`	`511`	`rxConfigParams->Datarate = MIN( datarate, EU868_RX_MAX_DATARATE );`
`512`	`512`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsEU868 );`
`513`	`513`
`514`	`514`	`if( rxConfigParams->Datarate == DR_7 )`
`515`	`515`	`{ // FSK`
`516`		`- tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );`
	`516`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesEU868[rxConfigParams->Datarate] );`
`517`	`517`	`}`
`518`	`518`	`else`
`519`	`519`	`{ // LoRa`
`520`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );`
	`520`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesEU868[rxConfigParams->Datarate], BandwidthsEU868[rxConfigParams->Datarate] );`
`521`	`521`	`}`
`522`	`522`
`523`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`523`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`bool RegionEU868RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -500,22 +500,22 @@ bool RegionIN865ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`500`	`500`
`501`	`501`	`void RegionIN865ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`502`	`502`	`{`
`503`		`- double tSymbol = 0.0;`
	`503`	`+ uint32_t tSymbolInUs = 0;`
`504`	`504`
`505`	`505`	`// Get the datarate, perform a boundary check`
`506`	`506`	`rxConfigParams->Datarate = MIN( datarate, IN865_RX_MAX_DATARATE );`
`507`	`507`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsIN865 );`
`508`	`508`
`509`	`509`	`if( rxConfigParams->Datarate == DR_7 )`
`510`	`510`	`{ // FSK`
`511`		`- tSymbol = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );`
	`511`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeFsk( DataratesIN865[rxConfigParams->Datarate] );`
`512`	`512`	`}`
`513`	`513`	`else`
`514`	`514`	`{ // LoRa`
`515`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );`
	`515`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesIN865[rxConfigParams->Datarate], BandwidthsIN865[rxConfigParams->Datarate] );`
`516`	`516`	`}`
`517`	`517`
`518`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`518`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`bool RegionIN865RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`
Original file line number	Diff line number	Diff line change
`@@ -494,15 +494,15 @@ bool RegionKR920ChanMaskSet( ChanMaskSetParams_t* chanMaskSet )`
`494`	`494`
`495`	`495`	`void RegionKR920ComputeRxWindowParameters( int8_t datarate, uint8_t minRxSymbols, uint32_t rxError, RxConfigParams_t *rxConfigParams )`
`496`	`496`	`{`
`497`		`- double tSymbol = 0.0;`
	`497`	`+ uint32_t tSymbolInUs = 0;`
`498`	`498`
`499`	`499`	`// Get the datarate, perform a boundary check`
`500`	`500`	`rxConfigParams->Datarate = MIN( datarate, KR920_RX_MAX_DATARATE );`
`501`	`501`	`rxConfigParams->Bandwidth = RegionCommonGetBandwidth( rxConfigParams->Datarate, BandwidthsKR920 );`
`502`	`502`
`503`		`- tSymbol = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );`
	`503`	`+ tSymbolInUs = RegionCommonComputeSymbolTimeLoRa( DataratesKR920[rxConfigParams->Datarate], BandwidthsKR920[rxConfigParams->Datarate] );`
`504`	`504`
`505`		`- RegionCommonComputeRxWindowParameters( tSymbol, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
	`505`	`+ RegionCommonComputeRxWindowParameters( tSymbolInUs, minRxSymbols, rxError, Radio.GetWakeupTime( ), &rxConfigParams->WindowTimeout, &rxConfigParams->WindowOffset );`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`bool RegionKR920RxConfig( RxConfigParams_t* rxConfig, int8_t* datarate )`