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/ModeSweep.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/ModeSweep.cpp')
| -rw-r--r-- | Mode/ModeSweep.cpp | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp index 6ff4e34..b6bef24 100644 --- a/Mode/ModeSweep.cpp +++ b/Mode/ModeSweep.cpp @@ -207,8 +207,7 @@ bool ModeSweep::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)); + _failure.updateRate(_dot->DataRateStr(_data_rate).substr(2)); _failure.updatePower(_power); if (_gps_available && _gps->getLockStatus()) { GPSPARSER::latitude lat = _gps->getLatitude(); @@ -343,8 +342,7 @@ void ModeSweep::displayHelp() { void ModeSweep::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()) { @@ -383,23 +381,21 @@ std::vector<point> ModeSweep::generatePoints() { uint8_t ModeSweep::payloadToRate(uint8_t payload) { if (_band == mDot::FB_915) { - if (payload <= mDot::MaxLengths_915[mDot::SF_10]) - return mDot::SF_10; - else if (payload <= mDot::MaxLengths_915[mDot::SF_9]) - return mDot::SF_9; - else if (payload <= mDot::MaxLengths_915[mDot::SF_8]) - return mDot::SF_8; + if (payload <= mDot::MaxLengths_915[mDot::DR0]) + return mDot::DR0; + else if (payload <= mDot::MaxLengths_915[mDot::DR1]) + return mDot::DR1; + else if (payload <= mDot::MaxLengths_915[mDot::DR2]) + return mDot::DR2; else - return mDot::SF_7; + return mDot::DR4; } else { - if (payload <= mDot::MaxLengths_868[mDot::SF_12]) - return mDot::SF_12; - else if (payload <= mDot::MaxLengths_868[mDot::SF_9]) - return mDot::SF_9; + if (payload <= mDot::MaxLengths_868[mDot::DR0]) + return mDot::DR0; + else if (payload <= mDot::MaxLengths_868[mDot::DR3]) + return mDot::DR3; else - return mDot::SF_7; + return mDot::DR6; } - - return mDot::SF_7; } |