Diff: CommandTerminal/CmdPublicNetwork.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

diff -r b0f5ae12dc05 -r f9a77400b622 CommandTerminal/CmdPublicNetwork.cpp
--- a/CommandTerminal/CmdPublicNetwork.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdPublicNetwork.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdPublicNetwork.h"
 
-CmdPublicNetwork::CmdPublicNetwork(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Public Network", "AT+PN", "Enable/disable public network mode. (0: off, 1: on)"), _serial(serial)
+CmdPublicNetwork::CmdPublicNetwork() :
+        Command("Public Network", "AT+PN", "Enable/disable public network mode. (0: off, 1: on)", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
@@ -12,18 +10,14 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("%s: ", name());
-
-        _serial.writef("%d\r\n", _dot->getPublicNetwork());
+        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getPublicNetwork());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         bool enable = (args[1] == "1");
 
-        if ((code = _dot->setPublicNetwork(enable)) != mDot::MDOT_OK) {
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setPublicNetwork(enable) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -39,13 +33,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;
 }