Diff: Mode/ModeJoin.cpp

Revision:

7:a31236c2e75c

Parent:

5:10ea08959743

Child:

12:05435282f899

--- a/Mode/ModeJoin.cpp	Fri Nov 04 22:21:01 2016 +0000
+++ b/Mode/ModeJoin.cpp	Fri Nov 04 17:27:05 2016 -0500
@@ -42,7 +42,7 @@
     _initial_data_rate = _dot->getTxDataRate();
     _initial_power = _dot->getTxPower();
 
-    _data_rate = (_band == mDot::FB_915) ? mDot::SF_10 : mDot::SF_12;
+    _data_rate = mDot::DR0;
     _power = 20;
     _joined = false;
 
@@ -119,13 +119,11 @@
         _join.updateId(_dot->getNetworkName());
         _join.updateKey(_dot->getNetworkPassphrase());
     }
-    if (_band == mDot::FB_915) {
+    if (_band == mDot::FB_US915 || _band == mDot::FB_AU915) {
         _sub_band = _dot->getFrequencySubBand();
         _join.updateFsb(_sub_band);
     }
-    // mDot::DataRateStr returns format SF_XX - we only want to display the XX part
-    _join.updateRate(_dot->DataRateStr(_data_rate).substr(3));
+    _join.updateRate(_dot->getTxDataRate());
     _join.updatePower(_power);
     _join.updateAttempt(_lora->getJoinAttempts());
 }
-