Diff: plans/ChannelPlan_US915.cpp

Revision:

115:bcd44682ac1e

Parent:

109:41d16d4ab0f0

Child:

134:e5ad4bd55ce5

diff -r 8462870088eb -r bcd44682ac1e plans/ChannelPlan_US915.cpp
--- a/plans/ChannelPlan_US915.cpp	Thu Dec 28 12:41:02 2017 -0600
+++ b/plans/ChannelPlan_US915.cpp	Thu Dec 28 13:50:17 2017 -0600
@@ -22,7 +22,7 @@
 
 const uint8_t ChannelPlan_US915::US915_TX_POWERS[] = { 30, 28, 26, 24, 22, 20, 18, 16, 14, 12, 10 };
 const uint8_t ChannelPlan_US915::US915_RADIO_POWERS[] = { 3, 3, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 18, 19, 19 };
-const uint8_t ChannelPlan_US915::US915_MAX_PAYLOAD_SIZE[] =          { 11, 53, 126, 242, 242, 0, 0, 0, 53, 129, 242, 242, 242, 242, 0, 0 };
+const uint8_t ChannelPlan_US915::US915_MAX_PAYLOAD_SIZE[] =          { 11, 53, 125, 242, 242, 0, 0, 0, 53, 129, 242, 242, 242, 242, 0, 0 };
 const uint8_t ChannelPlan_US915::US915_MAX_PAYLOAD_SIZE_REPEATER[] = { 11, 53, 126, 222, 222, 0, 0, 0, 33, 109, 222, 222, 222, 222, 0, 0 };
 
 ChannelPlan_US915::ChannelPlan_US915()
@@ -412,11 +412,7 @@
     } else {
         if (window == 1) {
             if (_txChannel < _numChans125k) {
-                if (GetSettings()->Network.Mode == PUBLIC) {
-                    rxw.Frequency = _freqDBase500k + (_txChannel % 8) * _freqDStep500k;
-                } else {
-                    rxw.Frequency = _freqDBase500k + (_txChannel / 8) * _freqDStep500k;
-                }
+                rxw.Frequency = _freqDBase500k + (_txChannel % 8) * _freqDStep500k;
             } else
                 rxw.Frequency = _freqDBase500k + (_txChannel - _numChans125k) * _freqDStep500k;
 
@@ -433,14 +429,7 @@
                     index = DR_8;
             }
         } else {
-            if (GetSettings()->Network.Mode == PUBLIC) {
-                rxw.Frequency = GetSettings()->Session.Rx2Frequency;
-            } else {
-                if (_txChannel < 64)
-                    rxw.Frequency = _freqDBase500k + (_txChannel / 8) * _freqDStep500k;
-                else
-                    rxw.Frequency = _freqDBase500k + (_txChannel % 8) * _freqDStep500k;
-            }
+            rxw.Frequency = GetSettings()->Session.Rx2Frequency;
             index = GetSettings()->Session.Rx2DatarateIndex;
         }
     }