From 2fa742c2c10c1d495a4428d94419e33bcf402199 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Fri, 4 Dec 2015 10:43:41 -0600 Subject: some tweaks to display in Demo Mode --- Mode/ModeDemo.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Mode') diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp index 80d202c..333bc54 100644 --- a/Mode/ModeDemo.cpp +++ b/Mode/ModeDemo.cpp @@ -91,6 +91,7 @@ bool ModeDemo::start() { case sampling: if (_mode == trigger) { _sam.updateSw2("Send"); + _sam.updateInfo(" "); } else { _sam.updateSw1("Interval"); _sam.updateInterval(_intervals[_interval]); @@ -110,6 +111,7 @@ bool ModeDemo::start() { case sampling: if (_mode == trigger) { _sam.updateSw2("Send"); + _sam.updateInfo(" "); } else { _sam.updateSw1("Interval"); _sam.updateInterval(_intervals[_interval]); @@ -144,20 +146,17 @@ bool ModeDemo::start() { } if (send) { std::vector s_data = formatSensorData(_data); - logInfo("sending data %s %d", _dot->DataRateStr(_data_rate).c_str(), _power); + logInfo("sending data %s %d", _dot->DataRateStr(_dot->getTxDataRate()).c_str(), _dot->getTxPower()); _sam.updateInfo("Sending..."); _sam.updateSw1(" "); _sam.updateSw2(" "); send = false; - _dot->setTxDataRate(_data_rate); - _dot->setTxPower(_power); // we don't care if the server actually gets this packet or not // we won't retry anyway _dot->setAck(0); _dot->setTxWait(false); _lora->send(s_data); osDelay(500); - _sam.updateInfo(" "); } } } -- cgit v1.2.3