Diff: CommandTerminal/CmdPreserveSession.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdPreserveSession.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdPreserveSession.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -7,13 +7,10 @@
 
 #include "CmdPreserveSession.h"
 
-CmdPreserveSession::CmdPreserveSession(mDot* dot, mts::MTSSerial& serial)
+CmdPreserveSession::CmdPreserveSession()
 :
-  Command(dot, "Preserve Session", "AT+PS", "Save network session info through reset or power down in AUTO_OTA mode (0:off, 1:on)"),
-  _serial(serial)
+  Command("Preserve Session", "AT+PS", "Save network session info through reset or power down in AUTO_OTA mode (0:off, 1:on)", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
@@ -25,12 +22,9 @@
 uint32_t CmdPreserveSession::action(std::vector<std::string> args) {
 
     if (args.size() == 1) {
-        if (_dot->getVerbose())
-            _serial.writef("Preserve Session: ");
-
-        _serial.writef("%u\r\n", _dot->getPreserveSession());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getPreserveSession());
     } else {
-        _dot->setPreserveSession(args[1] == "1");
+        CommandTerminal::Dot()->setPreserveSession(args[1] == "1");
     }
 
     return mDot::MDOT_OK;
@@ -43,13 +37,13 @@
     if (args.size() == 2) {
 
         if (args[1] != "1" && args[1] != "0") {
-            setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
+            CommandTerminal::setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }