diff options
| -rw-r--r-- | Layout/LayoutDemoSampling.cpp | 6 | ||||
| -rw-r--r-- | Mode/ModeDemo.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Layout/LayoutDemoSampling.cpp b/Layout/LayoutDemoSampling.cpp index 769d6b7..fa37bcb 100644 --- a/Layout/LayoutDemoSampling.cpp +++ b/Layout/LayoutDemoSampling.cpp @@ -53,11 +53,15 @@ void LayoutDemoSampling::updateSw2(std::string sw2) { void LayoutDemoSampling::updateCountdown(uint32_t seconds) { char buf[32]; size_t size; + std::string s; // make sure the string version is used writeField(_fInfo, string("No Free Channel"), true); size = snprintf(buf, sizeof(buf), "%lu s", seconds); - writeField(_fSw2, buf, size, true); + for (int i = 0; i < _fSw1._maxSize - size; i++) + s.append(" "); + s.append(buf, size); + writeField(_fSw1, s, true); } void LayoutDemoSampling::updateInterval(uint32_t seconds) { diff --git a/Mode/ModeDemo.cpp b/Mode/ModeDemo.cpp index d1dc793..380edb7 100644 --- a/Mode/ModeDemo.cpp +++ b/Mode/ModeDemo.cpp @@ -73,6 +73,8 @@ bool ModeDemo::start() { _sam.updateInterval(_intervals[_interval]); break; case sampling: + no_channel = false; + send = false; _send_timer.stop(); _send_timer.reset(); _state = show_help; @@ -83,7 +85,8 @@ bool ModeDemo::start() { case ButtonHandler::sw1_hold: _send_timer.stop(); _send_timer.reset(); - _dot->setTxDataRate(_initial_data_rate); + if (_band == mDot::FB_915) + _dot->setTxDataRate(_initial_data_rate); return true; } } |