Fix AU915 and US915 TX_POWER values according to regional parameters …

…v1.0.3reva_0 specification.
Lora-net · Jul 16, 2019 · 55b6688 · 55b6688
1 parent ed819b0
commit 55b6688
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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