Fix wrong beacon time-on-air calculation.

Author: Daniel Jaeckle

src/mac/LoRaMacClassB.c

@@ -1283,6 +1283,10 @@ bool LoRaMacClassBRxBeacon( uint8_t *payload, uint16_t size )
                 getPhy.Attribute = PHY_BEACON_CHANNEL_DR;
                 phyParam = RegionGetPhyParam( *Ctx.LoRaMacClassBParams.LoRaMacRegion, &getPhy );
 
+                getPhy.Attribute = PHY_SF_FROM_DR;
+                getPhy.Datarate = phyParam.Value;
+                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;

src/mac/region/Region.h

@@ -813,9 +813,9 @@ typedef enum ePhyAttribute
      */
     PHY_PING_SLOT_CHANNEL_DR,
     /*!
-     * Duty cycle period.
+     * The equivalent spreading factor value from datarate
      */
-    PHY_DUTY_CYCLE_PERIOD
+    PHY_SF_FROM_DR
 }PhyAttribute_t;
 
 /*!
@@ -916,7 +916,7 @@ typedef struct sGetPhyParams
     /*!
      * Datarate.
      * The parameter is needed for the following queries:
-     * PHY_MAX_PAYLOAD, PHY_NEXT_LOWER_TX_DR.
+     * PHY_MAX_PAYLOAD, PHY_NEXT_LOWER_TX_DR, PHY_SF_FROM_DR.
      */
     int8_t Datarate;
     /*!

src/mac/region/RegionAS923.c

@@ -332,6 +332,10 @@ PhyParam_t RegionAS923GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = AS923_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesAS923[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionAU915.c

@@ -354,6 +354,10 @@ PhyParam_t RegionAU915GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = AU915_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesAU915[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionCN470.c

@@ -305,6 +305,10 @@ PhyParam_t RegionCN470GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = CN470_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesCN470[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionCN779.c

@@ -300,6 +300,10 @@ PhyParam_t RegionCN779GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = CN779_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesCN779[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionEU433.c

@@ -300,6 +300,10 @@ PhyParam_t RegionEU433GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = EU433_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesEU433[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionEU868.c

@@ -325,6 +325,10 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = EU868_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesEU868[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionIN865.c

@@ -304,6 +304,10 @@ PhyParam_t RegionIN865GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = IN865_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesIN865[getPhy->Datarate];
+        }
         default:
         {
             break;

src/mac/region/RegionKR920.c

@@ -314,6 +314,10 @@ PhyParam_t RegionKR920GetPhyParam( GetPhyParams_t* getPhy )
             phyParam.Value = KR920_PING_SLOT_CHANNEL_DR;
             break;
         }
+        case PHY_SF_FROM_DR:
+        {
+            phyParam.Value = DataratesKR920[getPhy->Datarate];
+        }
         default:
         {
             break;