summaryrefslogtreecommitdiff
path: root/Mode/ModeJoin.cpp
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2016-08-18 15:18:44 -0500
committerMike Fiore <mfiore@multitech.com>2016-08-18 15:18:44 -0500
commit89072eb96a73fcb0bc899ca07ea9731bf9cde73f (patch)
tree42f192647733b1b6d8e175ac6a8278005558de11 /Mode/ModeJoin.cpp
parent3b6a9751bed0f75a12fae4cb356f7f9a1faf13a2 (diff)
parentd15988a5fc22ea3b106ddd87b4457f378a6580fd (diff)
downloadmtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.tar.gz
mtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.tar.bz2
mtdot-box-evb-factory-firmware-89072eb96a73fcb0bc899ca07ea9731bf9cde73f.zip
Merge branch 'Semtech/GpsSurveryMode'
Conflicts: main.cpp
Diffstat (limited to 'Mode/ModeJoin.cpp')
-rw-r--r--Mode/ModeJoin.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp
index 5618eca..239eadb 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,9 +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());
-}
-
+} \ No newline at end of file