From c73e774937b387edffeec634296662f906ba26f8 Mon Sep 17 00:00:00 2001 From: Ryan Klaassen Date: Tue, 16 Aug 2016 14:41:23 -0500 Subject: Replace ModeJoin.cpp --- Mode/ModeJoin.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp index 5618eca..1608567 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 = (_band == mDot::FB_915) ? mDot::DR4 : mDot::SF_12; _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->getTxDataRate()); _join.updatePower(_power); _join.updateAttempt(_lora->getJoinAttempts()); } -- cgit v1.2.3