diff options
author | Mike Fiore <mfiore@multitech.com> | 2015-12-11 10:18:02 -0600 |
---|---|---|
committer | Mike Fiore <mfiore@multitech.com> | 2015-12-11 10:18:02 -0600 |
commit | c28f3e07a6320f48476fd4dad5cca0011669e49f (patch) | |
tree | 063962dd2197419f62cd2555b8525df89db18ea1 /Mode/ModeSweep.cpp | |
parent | a1bb849d38853c79285665e702f9425770e74133 (diff) | |
parent | 279d4b746cb23dce634c968a86eaab0199f1d4af (diff) | |
download | mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.tar.gz mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.tar.bz2 mtdot-box-evb-factory-firmware-c28f3e07a6320f48476fd4dad5cca0011669e49f.zip |
Merge branch 'link_check'
Conflicts:
Layout/LayoutSurveySuccess.cpp
Mode/Mode.cpp
Diffstat (limited to 'Mode/ModeSweep.cpp')
-rw-r--r-- | Mode/ModeSweep.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Mode/ModeSweep.cpp b/Mode/ModeSweep.cpp index 45fdee0..4ccb05e 100644 --- a/Mode/ModeSweep.cpp +++ b/Mode/ModeSweep.cpp @@ -162,11 +162,11 @@ bool ModeSweep::start() { if (e.value.signals & loraSignal) { _ls = _lora->getStatus(); switch (_ls) { - case LoRaHandler::ping_success: + case LoRaHandler::link_check_success: switch (_state) { case in_progress: _survey_success++; - _ping_result = _lora->getPingResults(); + _link_check_result = _lora->getLinkCheckResults(); displaySuccess(); logInfo("ping successful"); updateData(_data, sweep, true); @@ -186,7 +186,7 @@ bool ModeSweep::start() { } break; - case LoRaHandler::ping_failure: + case LoRaHandler::link_check_failure: switch (_state) { case in_progress: _survey_failure++; @@ -300,7 +300,7 @@ bool ModeSweep::start() { send_ping = false; _dot->setTxDataRate(_data_rate); _dot->setTxPower(_power); - _lora->ping(); + _lora->linkCheck(); } if (send_data) { std::vector<uint8_t> s_data = formatSurveyData(_data); @@ -332,7 +332,7 @@ void ModeSweep::displaySuccess() { // mDot::DataRateStr returns format SF_XX - we only want to display the XX part _success.updateRate(_dot->DataRateStr(_data_rate).substr(3)); _success.updatePower(_power); - _success.updateStats(_ping_result); + _success.updateStats(_link_check_result); if (_gps_available && _gps->getLockStatus()) { GPSPARSER::latitude lat = _gps->getLatitude(); GPSPARSER::longitude lon = _gps->getLongitude(); |