diff options
| author | Mike Fiore <mfiore@multitech.com> | 2015-12-01 15:11:03 -0600 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2015-12-01 15:11:03 -0600 |
| commit | 4a7ab715f7115460892927b998b2c45828f275d6 (patch) | |
| tree | 4b5be7037a4c5b7bd6f54cdb6a0ceb16d498294a /Mode | |
| parent | 98e68d87d69d961eb41cf4a5ba21e1b2ac430615 (diff) | |
| download | mtdot-box-evb-factory-firmware-4a7ab715f7115460892927b998b2c45828f275d6.tar.gz mtdot-box-evb-factory-firmware-4a7ab715f7115460892927b998b2c45828f275d6.tar.bz2 mtdot-box-evb-factory-firmware-4a7ab715f7115460892927b998b2c45828f275d6.zip | |
update progress and pass/fail for sweep
Diffstat (limited to 'Mode')
| -rw-r--r-- | Mode/ModeSingle.cpp | 6 | ||||
| -rw-r--r-- | Mode/ModeSweep.cpp | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Mode/ModeSingle.cpp b/Mode/ModeSingle.cpp index 6150128..083b72d 100644 --- a/Mode/ModeSingle.cpp +++ b/Mode/ModeSingle.cpp @@ -80,7 +80,7 @@ bool ModeSingle::start() { break; case failure: incrementRatePower(); - _failure.updateInfo(formatNewRatePower()); + _failure.updateInfo2(formatNewRatePower()); logInfo("new data rate %u, power %lu", _data_rate, _power); break; } @@ -189,6 +189,8 @@ bool ModeSingle::start() { updateData(_data, single, false); appendDataFile(_data); _failure.updatePower(_power); + _failure.updateSw1(" Power"); + _failure.updateSw2("Survey"); logInfo("ping failed"); break; case success: @@ -311,7 +313,7 @@ void ModeSingle::displaySuccess() { // display GPS latitude, longitude, and time // else // display "no lock" - _success.updateInfo("No GPS Lock"); + _success.updateGpsLatitude("No GPS Lock"); } std::string ModeSingle::formatNewRatePower() { diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp index a62d79c..938ec83 100644 --- a/Mode/ModeSweep.cpp +++ b/Mode/ModeSweep.cpp @@ -226,9 +226,11 @@ bool ModeSweep::start() { _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.updatePower(_power); + _failure.updatePassFail(_survey_success, _survey_failure); + _failure.updateSw1(" Cancel"); updateData(_data, sweep, false); appendDataFile(_data); - _failure.updatePower(_power); logInfo("ping failed"); _display_timer.start(); break; @@ -383,7 +385,8 @@ void ModeSweep::displaySuccess() { // display GPS latitude, longitude, and time // else // display "no lock" - _success.updateInfo("No GPS Lock"); + _success.updateGpsLatitude("No GPS Lock"); + _success.updatePassFail(_survey_success, _survey_failure); } std::vector<point> ModeSweep::generatePoints() { |