Diff: plans/ChannelPlan_AU915.cpp

Revision:

115:bcd44682ac1e

Parent:

104:9662b62f1977

Child:

134:e5ad4bd55ce5

diff -r 8462870088eb -r bcd44682ac1e plans/ChannelPlan_AU915.cpp
--- a/plans/ChannelPlan_AU915.cpp	Thu Dec 28 12:41:02 2017 -0600
+++ b/plans/ChannelPlan_AU915.cpp	Thu Dec 28 13:50:17 2017 -0600
@@ -403,11 +403,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;
 
@@ -424,14 +420,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;
         }
     }
@@ -975,4 +964,4 @@
     }
 
     return LORA_OK;
-}
\ No newline at end of file
+}