summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Klaassen <ryan.klaassen@multitech.com>2016-08-16 14:41:23 -0500
committerRyan Klaassen <ryan.klaassen@multitech.com>2016-08-16 14:41:23 -0500
commitc73e774937b387edffeec634296662f906ba26f8 (patch)
treedbf9cd17fc254f15cc4a21d8e7f8cdcc6a5e1c78
parent47922b3fee79ada5c9c5b1e9638523f70b63590e (diff)
downloadmtdot-box-evb-factory-firmware-c73e774937b387edffeec634296662f906ba26f8.tar.gz
mtdot-box-evb-factory-firmware-c73e774937b387edffeec634296662f906ba26f8.tar.bz2
mtdot-box-evb-factory-firmware-c73e774937b387edffeec634296662f906ba26f8.zip
Replace ModeJoin.cpp
-rw-r--r--Mode/ModeJoin.cpp5
1 files 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());
}