add info line to help layout

4 files changed, 21 insertions, 9 deletions

diff --git a/Layout/LayoutHelp.cpp b/Layout/LayoutHelp.cpp
index 0e029de..7ed3e61 100644
--- a/Layout/LayoutHelp.cpp
+++ b/Layout/LayoutHelp.cpp
@@ -6,6 +6,7 @@ LayoutHelp::LayoutHelp(DOGS102* lcd)
     _lIns2(0, 5, "for Main Menu"),
     _fMode(0, 0, 17),
     _fDesc(0, 1, 17),
+    _fMsg(0, 6, 17),
     _fSw1(9, 7, 8),
     _fSw2(0, 7, 8)
 {}
@@ -23,18 +24,26 @@ void LayoutHelp::display() {
 }
 
 void LayoutHelp::updateMode(std::string mode) {
-    writeField(_fMode, mode);
+    writeField(_fMode, mode, true);
 }
 
 void LayoutHelp::updateDescription(std::string description) {
-    writeField(_fDesc, description);
+    writeField(_fDesc, description, true);
+}
+
+void LayoutHelp::updateMsg(std::string msg) {
+    writeField(_fMsg, msg, true);
+}
+
+void LayoutHelp::removeMsg() {
+    removeField(_fMsg);
 }
 
 void LayoutHelp::updateSw1(std::string s) {
-    writeField(_fSw1, s);
+    writeField(_fSw1, s, true);
 }
 
 void LayoutHelp::updateSw2(std::string s) {
-    writeField(_fSw2, s);
+    writeField(_fSw2, s, true);
 }
 
diff --git a/Layout/LayoutHelp.h b/Layout/LayoutHelp.h
index 58ddf7c..44e70d5 100644
--- a/Layout/LayoutHelp.h
+++ b/Layout/LayoutHelp.h
@@ -11,6 +11,8 @@ class LayoutHelp : public Layout {
         void display();
         void updateMode(std::string mode);
         void updateDescription(std::string description);
+        void updateMsg(std::string msg);
+        void removeMsg();
         void updateSw1(std::string s);
         void updateSw2(std::string s);
 
@@ -20,6 +22,7 @@ class LayoutHelp : public Layout {
 
         Field _fMode;
         Field _fDesc;
+        Field _fMsg;
         Field _fSw1;
         Field _fSw2;
 
diff --git a/Layout/LayoutJoin.cpp b/Layout/LayoutJoin.cpp
index 6a2e3be..5ff93d7 100644
--- a/Layout/LayoutJoin.cpp
+++ b/Layout/LayoutJoin.cpp
@@ -58,7 +58,7 @@ void LayoutJoin::updateFsb(uint8_t band) {
 }
 
 void LayoutJoin::updateRate(std::string rate) {
-    writeField(_fRate, rate);
+    writeField(_fRate, rate, true);
 }
 
 void LayoutJoin::updatePower(uint32_t power) {
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();