summaryrefslogtreecommitdiff
path: root/Mode
diff options
context:
space:
mode:
authorMike Fiore <mfiore@multitech.com>2015-11-19 12:43:39 -0600
committerMike Fiore <mfiore@multitech.com>2015-11-19 12:43:39 -0600
commit11412cbac7021dd8aee14ac4f1dc25994c9ab45b (patch)
treec36accb42e1c2ef3711d1f2e80fe7eb99dc6d13b /Mode
parenta683f4689264f85953c246ac15492bad25974197 (diff)
downloadmtdot-box-evb-factory-firmware-11412cbac7021dd8aee14ac4f1dc25994c9ab45b.tar.gz
mtdot-box-evb-factory-firmware-11412cbac7021dd8aee14ac4f1dc25994c9ab45b.tar.bz2
mtdot-box-evb-factory-firmware-11412cbac7021dd8aee14ac4f1dc25994c9ab45b.zip
add info line to help layout
Diffstat (limited to 'Mode')
-rw-r--r--Mode/ModeJoin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Mode/ModeJoin.cpp b/Mode/ModeJoin.cpp
index 492f669..5af4dcd 100644
--- a/Mode/ModeJoin.cpp
+++ b/Mode/ModeJoin.cpp
@@ -45,14 +45,14 @@ bool ModeJoin::start() {
while (! _joined) {
_next_tx = _lora->getNextTx();
if (_next_tx) {
- _join.updateCountdown(_next_tx * 1000);
+ _join.updateCountdown(_next_tx / 1000);
} else {
- _join.updateAttempt(_index++);
_join.updateStatus("Joining...");
- _lora->join();
+ if (_lora->join())
+ _join.updateAttempt(_index++);
}
- osEvent e = Thread::signal_wait(0);
+ osEvent e = Thread::signal_wait(0, 500);
if (e.status == osEventSignal) {
if (e.value.signals & buttonSignal) {
_be = _buttons->getButtonEvent();