Updated Radio.TimeOnAir API in order to be independent of the current hardware settings.

mluis1 · mluis1 · commit 096836162956 · 2020-03-26T14:52:12.000+01:00
diff --git a/src/mac/LoRaMacClassB.c b/src/mac/LoRaMacClassB.c
@@ -1280,7 +1280,10 @@ bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
             // Reset beacon variables, if one of the crc is valid
             if( beaconProcessed == true )
             {
-                TimerTime_t time = Radio.TimeOnAir( MODEM_LORA, size );
+                getPhy.Attribute = PHY_BEACON_CHANNEL_DR;
+                phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
+
+                TimerTime_t time = Radio.TimeOnAir( MODEM_LORA, 0, phyParam.Value, 1, 8, false, size, true );
                 SysTime_t timeOnAir;
                 timeOnAir.Seconds = time / 1000;
                 timeOnAir.SubSeconds = time - timeOnAir.Seconds * 1000;
diff --git a/src/mac/region/RegionAS923.c b/src/mac/region/RegionAS923.c
@@ -600,17 +600,17 @@ bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionAU915.c b/src/mac/region/RegionAU915.c
@@ -603,10 +603,10 @@ bool RegionAU915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
-
-    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, txConfig->PktLen );
+    // Get the time-on-air of the next tx frame
+    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
+    
     *txPower = txPowerLimited;
-
     return true;
 }
 
diff --git a/src/mac/region/RegionCN470.c b/src/mac/region/RegionCN470.c
@@ -510,7 +510,7 @@ bool RegionCN470TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, 0, phyDr, 1, 8, false, txConfig->PktLen, true );
     *txPower = txPowerLimited;
 
     return true;
diff --git a/src/mac/region/RegionCN779.c b/src/mac/region/RegionCN779.c
@@ -556,17 +556,19 @@ bool RegionCN779TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionEU433.c b/src/mac/region/RegionEU433.c
@@ -556,17 +556,19 @@ bool RegionEU433TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionEU868.c b/src/mac/region/RegionEU868.c
@@ -587,17 +587,17 @@ bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionIN865.c b/src/mac/region/RegionIN865.c
@@ -573,17 +573,19 @@ bool RegionIN865TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionKR920.c b/src/mac/region/RegionKR920.c
@@ -566,7 +566,7 @@ bool RegionKR920TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, txConfig->PktLen );
+    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionRU864.c b/src/mac/region/RegionRU864.c
@@ -549,17 +549,19 @@ bool RegionRU864TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     { // High Speed FSK channel
         modem = MODEM_FSK;
         Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr * 1000, 0, 5, false, txConfig->PktLen, true );
     }
     else
     {
         modem = MODEM_LORA;
         Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );
+        // Get the time-on-air of the next tx frame
+        *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
     }
 
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( modem, txConfig->PktLen );
-    // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );
 
     *txPower = txPowerLimited;
     return true;
diff --git a/src/mac/region/RegionUS915.c b/src/mac/region/RegionUS915.c
@@ -690,9 +690,9 @@ bool RegionUS915TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime
     // Setup maximum payload lenght of the radio driver
     Radio.SetMaxPayloadLength( MODEM_LORA, txConfig->PktLen );
     // Get the time-on-air of the next tx frame
-    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, txConfig->PktLen );
-    *txPower = txPowerLimited;
+    *txTimeOnAir = Radio.TimeOnAir( MODEM_LORA, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );
 
+    *txPower = txPowerLimited;
     return true;
 }
 
diff --git a/src/radio/radio.h b/src/radio/radio.h
@@ -248,11 +248,30 @@ struct Radio_s
      * \Remark Can only be called once SetRxConfig or SetTxConfig have been called
      *
      * \param [IN] modem      Radio modem to be used [0: FSK, 1: LoRa]
-     * \param [IN] pktLen     Packet payload length
+     * \param [IN] bandwidth    Sets the bandwidth
+     *                          FSK : >= 2600 and <= 250000 Hz
+     *                          LoRa: [0: 125 kHz, 1: 250 kHz,
+     *                                 2: 500 kHz, 3: Reserved]
+     * \param [IN] datarate     Sets the Datarate
+     *                          FSK : 600..300000 bits/s
+     *                          LoRa: [6: 64, 7: 128, 8: 256, 9: 512,
+     *                                10: 1024, 11: 2048, 12: 4096  chips]
+     * \param [IN] coderate     Sets the coding rate (LoRa only)
+     *                          FSK : N/A ( set to 0 )
+     *                          LoRa: [1: 4/5, 2: 4/6, 3: 4/7, 4: 4/8]
+     * \param [IN] preambleLen  Sets the Preamble length
+     *                          FSK : Number of bytes
+     *                          LoRa: Length in symbols (the hardware adds 4 more symbols)
+     * \param [IN] fixLen       Fixed length packets [0: variable, 1: fixed]
+     * \param [IN] payloadLen   Sets payload length when fixed length is used
+     * \param [IN] crcOn        Enables/Disables the CRC [0: OFF, 1: ON]
      *
      * \retval airTime        Computed airTime (ms) for the given packet payload length
      */
-    uint32_t  ( *TimeOnAir )( RadioModems_t modem, uint8_t pktLen );
+    uint32_t  ( *TimeOnAir )( RadioModems_t modem, uint32_t bandwidth,
+                              uint32_t datarate, uint8_t coderate,
+                              uint16_t preambleLen, bool fixLen, uint8_t payloadLen,
+                              bool crcOn );
     /*!
      * \brief Sends the buffer of size. Prepares the packet to be sent and sets
      *        the radio in transmission
diff --git a/src/radio/sx126x/radio.c b/src/radio/sx126x/radio.c
diff --git a/src/radio/sx1272/sx1272.c b/src/radio/sx1272/sx1272.c
diff --git a/src/radio/sx1272/sx1272.h b/src/radio/sx1272/sx1272.h
diff --git a/src/radio/sx1276/sx1276.c b/src/radio/sx1276/sx1276.c
diff --git a/src/radio/sx1276/sx1276.h b/src/radio/sx1276/sx1276.h

Original file line number	Diff line number	Diff line change
`@@ -600,17 +600,17 @@ bool RegionAS923TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime`
`600`	`600`	`{ // High Speed FSK channel`
`601`	`601`	`modem = MODEM_FSK;`
`602`	`602`	`Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );`
	`603`	`+ txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr 1000, 0, 5, false, txConfig->PktLen, true );`
`603`	`604`	`}`
`604`	`605`	`else`
`605`	`606`	`{`
`606`	`607`	`modem = MODEM_LORA;`
`607`	`608`	`Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );`
	`609`	`+ *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );`
`608`	`610`	`}`
`609`	`611`
`610`	`612`	`// Setup maximum payload lenght of the radio driver`
`611`	`613`	`Radio.SetMaxPayloadLength( modem, txConfig->PktLen );`
`612`		`- // Get the time-on-air of the next tx frame`
`613`		`- *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );`
`614`	`614`
`615`	`615`	`*txPower = txPowerLimited;`
`616`	`616`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -587,17 +587,17 @@ bool RegionEU868TxConfig( TxConfigParams_t* txConfig, int8_t* txPower, TimerTime`
`587`	`587`	`{ // High Speed FSK channel`
`588`	`588`	`modem = MODEM_FSK;`
`589`	`589`	`Radio.SetTxConfig( modem, phyTxPower, 25000, bandwidth, phyDr * 1000, 0, 5, false, true, 0, 0, false, 4000 );`
	`590`	`+ txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr 1000, 0, 5, false, txConfig->PktLen, true );`
`590`	`591`	`}`
`591`	`592`	`else`
`592`	`593`	`{`
`593`	`594`	`modem = MODEM_LORA;`
`594`	`595`	`Radio.SetTxConfig( modem, phyTxPower, 0, bandwidth, phyDr, 1, 8, false, true, 0, 0, false, 4000 );`
	`596`	`+ *txTimeOnAir = Radio.TimeOnAir( modem, bandwidth, phyDr, 1, 8, false, txConfig->PktLen, true );`
`595`	`597`	`}`
`596`	`598`
`597`	`599`	`// Setup maximum payload lenght of the radio driver`
`598`	`600`	`Radio.SetMaxPayloadLength( modem, txConfig->PktLen );`
`599`		`- // Get the time-on-air of the next tx frame`
`600`		`- *txTimeOnAir = Radio.TimeOnAir( modem, txConfig->PktLen );`
`601`	`601`
`602`	`602`	`*txPower = txPowerLimited;`
`603`	`603`	`return true;`