Diff: CommandTerminal/CmdStartUpMode.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdStartUpMode.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdStartUpMode.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdStartUpMode.h"
 
-CmdStartUpMode::CmdStartUpMode(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Start Up Mode", "AT+SMODE", "0: AT command mode, 1: Serial data mode"), _serial(serial)
+CmdStartUpMode::CmdStartUpMode() :
+        Command("Start Up Mode", "AT+SMODE", "0: AT command mode, 1: Serial data mode", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
@@ -12,21 +10,18 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("%s: ", name());
-
-        _serial.writef("%u\r\n", _dot->getStartUpMode());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getStartUpMode());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
+        
         uint8_t mode;
 
         mode = (args[1] == "1") ? mDot::SERIAL_MODE : mDot::COMMAND_MODE;
 
-        if ((code = _dot->setStartUpMode(mode)) != mDot::MDOT_OK) {
+        if (CommandTerminal::Dot()->setStartUpMode(mode) != mDot::MDOT_OK) {
             
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -42,13 +37,13 @@
     if (args.size() == 2)
     {
         if (args[1] != "1" && args[1] != "0") {
-            setErrorMessage("Invalid parameter, expects (0: Command, 1: Serial Data)");
+            CommandTerminal::setErrorMessage("Invalid parameter, expects (0: Command, 1: Serial Data)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }