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/ModeSingle.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/ModeSingle.cpp')
-rw-r--r-- | Mode/ModeSingle.cpp | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp index 347f636..982d8b9 100644 --- a/Mode/ModeSingle.cpp +++ b/Mode/ModeSingle.cpp @@ -176,8 +176,8 @@ bool ModeSingle::start() { _state = failure; _failure.display(); _failure.updateId(_index); - // mDot::DataRateStr returns format SF_XX - we only want to display the XX part - _failure.updateRate(_dot->DataRateStr(_data_rate).substr(3)); + // mDot::DataRateStr returns format DRXX - we only want to display the XX part + _failure.updateRate(_dot->DataRateStr(_data_rate).substr(2)); updateData(_data, single, false); appendDataFile(_data); _failure.updatePower(_power); @@ -291,7 +291,7 @@ void ModeSingle::displaySuccess() { _success.display(); _success.updateId(_index); // mDot::DataRateStr returns format SF_XX - we only want to display the XX part - _success.updateRate(_dot->DataRateStr(_data_rate).substr(3)); + _success.updateRate(_dot->DataRateStr(_data_rate).substr(2)); _success.updatePower(_power); _success.updateStats(_link_check_result); if (_gps_available && _gps->getLockStatus()) { @@ -312,7 +312,7 @@ std::string ModeSingle::formatRatePower() { size_t size; msg += "DR="; - msg += _dot->DataRateStr(_data_rate).substr(3); + msg += _dot->DataRateStr(_data_rate).substr(2); msg += " P="; size = snprintf(buf, sizeof(buf), "%u", _power); msg.append(buf, size); @@ -323,28 +323,9 @@ std::string ModeSingle::formatRatePower() { void ModeSingle::incrementRatePower() { if (_power == 20) { _power = 2; - switch (_data_rate) { - case mDot::SF_7: - _data_rate = mDot::SF_8; - break; - case mDot::SF_8: - _data_rate = mDot::SF_9; - break; - case mDot::SF_9: - _data_rate = mDot::SF_10; - break; - case mDot::SF_10: - if (_band == mDot::FB_915) - _data_rate = mDot::SF_7; - else - _data_rate = mDot::SF_11; - break; - case mDot::SF_11: - _data_rate = mDot::SF_12; - break; - case mDot::SF_12: - _data_rate = mDot::SF_7; - break; + _data_rate++; + if (_band == mDot::FB_915 && _data_rate > mDot::DR4 || _band == mDot::FB_868 && _data_rate > mDot::DR7) { + _data_rate = mDot::DR0; } } else { _power += 3; |