From 55b668869175a2f87dbe1ea8c64f5c9460e4194a Mon Sep 17 00:00:00 2001 From: Miguel Luis Date: Tue, 16 Jul 2019 10:45:53 +0200 Subject: [PATCH] Fix AU915 and US915 TX_POWER values according to regional parameters v1.0.3reva_0 specification. --- src/mac/region/Region.h | 56 ++++++++++++++++++++++++++++++++---- src/mac/region/RegionAU915.h | 2 +- src/mac/region/RegionUS915.h | 2 +- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/mac/region/Region.h b/src/mac/region/Region.h index 9ef065768..da52a87ef 100644 --- a/src/mac/region/Region.h +++ b/src/mac/region/Region.h @@ -476,7 +476,7 @@ * EU868 | - * IN865 | Max EIRP - 18 * KR920 | - - * US915 | Max ERP - 16 + * US915 | Max ERP - 18 * RU864 | - */ #define TX_POWER_9 9 @@ -492,28 +492,72 @@ * EU868 | - * IN865 | Max EIRP - 20 * KR920 | - - * US915 | Max ERP - 10 + * US915 | Max ERP - 20 * RU864 | - */ #define TX_POWER_10 10 /*! - * RFU + * Region | dBM + * ------------ | :-----: + * AS923 | - + * AU915 | Max EIRP - 22 + * CN470 | - + * CN779 | - + * EU433 | - + * EU868 | - + * IN865 | - + * KR920 | - + * US915 | Max ERP - 22 + * RU864 | - */ #define TX_POWER_11 11 /*! - * RFU + * Region | dBM + * ------------ | :-----: + * AS923 | - + * AU915 | Max EIRP - 24 + * CN470 | - + * CN779 | - + * EU433 | - + * EU868 | - + * IN865 | - + * KR920 | - + * US915 | Max ERP - 24 + * RU864 | - */ #define TX_POWER_12 12 /*! - * RFU + * Region | dBM + * ------------ | :-----: + * AS923 | - + * AU915 | Max EIRP - 26 + * CN470 | - + * CN779 | - + * EU433 | - + * EU868 | - + * IN865 | - + * KR920 | - + * US915 | Max ERP - 26 + * RU864 | - */ #define TX_POWER_13 13 /*! - * RFU + * Region | dBM + * ------------ | :-----: + * AS923 | - + * AU915 | Max EIRP - 28 + * CN470 | - + * CN779 | - + * EU433 | - + * EU868 | - + * IN865 | - + * KR920 | - + * US915 | Max ERP - 28 + * RU864 | - */ #define TX_POWER_14 14 diff --git a/src/mac/region/RegionAU915.h b/src/mac/region/RegionAU915.h index 94157229a..8ee26bf1f 100644 --- a/src/mac/region/RegionAU915.h +++ b/src/mac/region/RegionAU915.h @@ -93,7 +93,7 @@ /*! * Minimal Tx output power that can be used by the node */ -#define AU915_MIN_TX_POWER TX_POWER_15 +#define AU915_MIN_TX_POWER TX_POWER_14 /*! * Maximal Tx output power that can be used by the node diff --git a/src/mac/region/RegionUS915.h b/src/mac/region/RegionUS915.h index 47075e6c5..9622a7353 100644 --- a/src/mac/region/RegionUS915.h +++ b/src/mac/region/RegionUS915.h @@ -87,7 +87,7 @@ /*! * Minimal Tx output power that can be used by the node */ -#define US915_MIN_TX_POWER TX_POWER_15 +#define US915_MIN_TX_POWER TX_POWER_14 /*! * Maximal Tx output power that can be used by the node