diff options
author | Jason Reiss <jreiss@multitech.com> | 2016-09-14 11:01:44 -0500 |
---|---|---|
committer | Jason Reiss <jreiss@multitech.com> | 2016-09-14 11:01:44 -0500 |
commit | 6efd824f3d18ba8985cbc87f629f5e737495c054 (patch) | |
tree | 5448db65ea84f56c2551ec3efd74d64daacdd6d9 /Mode/ModeJoin.cpp | |
parent | 54270b95f3fe169948ef551c49204defcda4033b (diff) | |
parent | 768951bf1beb7a368b1a94b71a95c832d1f2fcc6 (diff) | |
download | mtdot-box-evb-factory-firmware-6efd824f3d18ba8985cbc87f629f5e737495c054.tar.gz mtdot-box-evb-factory-firmware-6efd824f3d18ba8985cbc87f629f5e737495c054.tar.bz2 mtdot-box-evb-factory-firmware-6efd824f3d18ba8985cbc87f629f5e737495c054.zip |
Merge branch 'mts-lora' into Semtech
Conflicts:
main.cpp
Diffstat (limited to 'Mode/ModeJoin.cpp')
-rw-r--r-- | Mode/ModeJoin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp index 5618eca..4bdc6cd 100644 --- a/Mode/ModeJoin.cpp +++ b/Mode/ModeJoin.cpp @@ -42,7 +42,7 @@ bool ModeJoin::start() { _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; @@ -123,8 +123,7 @@ void ModeJoin::display() { _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->DataRateStr(_data_rate).substr(2)); _join.updatePower(_power); _join.updateAttempt(_lora->getJoinAttempts()); } |