From 393317f7d04753d6e9773393a96c311a88a27f7b Mon Sep 17 00:00:00 2001
From: Leon Lindenfelser <llindenfelser@multitech.com>
Date: Fri, 20 Nov 2015 10:23:26 -0600
Subject: AT commands are working in modeConfig.

---
 main.cpp | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 9b9b165..424626b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -24,6 +24,7 @@
 #include "LoRaHandler.h"
 // mode objects
 #include "ModeJoin.h"
+#include "ModeConfig.h"
 // misc heders
 #include <string>
 
@@ -47,10 +48,10 @@ mDot* dot;
 
 // Modes
 ModeJoin* modeJoin;
+ModeConfig* modeConfig;
 
 // Serial debug port
 Serial debug(USBTX, USBRX);
-mts::MTSSerial serial(USBTX, USBRX, 512, 512);
 
 // Prototypes
 void mainMenu();
@@ -72,6 +73,7 @@ int main() {
     lora = new LoRaHandler(main_id);
 
     modeJoin = new ModeJoin(lcd, buttons, dot, lora, dot->getFrequencyBand());
+    modeConfig = new ModeConfig(lcd, buttons, dot);
 
     // display startup screen for 3 seconds
     LayoutStartup ls(lcd);
@@ -149,7 +151,7 @@ void mainMenu() {
             if (modeJoin->start())
                 loraDemo();
         } else if (selected == menu_strings[config]) {
-            configuration();
+            modeConfig->start();
         } else if (selected == menu_strings[single]) {
             if (modeJoin->start())
                 surveySingle();
@@ -162,33 +164,6 @@ void mainMenu() {
     }
 }
 
-void configuration() {
-    LayoutConfig lc(lcd);
-
-    // clear any stale signals
-    osSignalClear(main_id, buttonSignal | loraSignal);
-
-    lc.display();
-    logInfo("config mode");
-
-    while (true) {
-        osEvent e = Thread::signal_wait(buttonSignal);
-        if (e.status == osEventSignal) {
-            ButtonHandler::ButtonEvent ev = buttons->getButtonEvent();
-            switch (ev) {
-                case ButtonHandler::sw1_press:
-                    break;
-                case ButtonHandler::sw2_press:
-                    break;
-                case ButtonHandler::sw1_hold:
-                    return;
-                default:
-                    break;
-            }
-        }
-    }
-}
-
 void loraDemo() {
     LayoutDemoHelp ldh(lcd);
 
-- 
cgit v1.2.3


From 4ea46cbfee73c43579ea657cabc7f1fc7de97874 Mon Sep 17 00:00:00 2001
From: Leon Lindenfelser <llindenfelser@multitech.com>
Date: Fri, 20 Nov 2015 16:21:44 -0600
Subject: 1. Merged CommandTerminal into ModeConfig and deleted
 CommandTerminal. 2. Fixed AT&V output. 3. Cleaned up some unused code. 4.
 Added +FREQ back in. 5. Removed CmdExit and put the +EXIT command right in
 the command parsing code.

---
 main.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 424626b..d52ae8d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,6 +52,8 @@ ModeConfig* modeConfig;
 
 // Serial debug port
 Serial debug(USBTX, USBRX);
+// Config mode serial port.
+mts::MTSSerial serial(USBTX, USBRX, 512, 512);
 
 // Prototypes
 void mainMenu();
@@ -73,7 +75,7 @@ int main() {
     lora = new LoRaHandler(main_id);
 
     modeJoin = new ModeJoin(lcd, buttons, dot, lora, dot->getFrequencyBand());
-    modeConfig = new ModeConfig(lcd, buttons, dot);
+    modeConfig = new ModeConfig(lcd, serial, dot, buttons);
 
     // display startup screen for 3 seconds
     LayoutStartup ls(lcd);
-- 
cgit v1.2.3