Diff: CommandTerminal/CmdNetworkJoinMode.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdNetworkJoinMode.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdNetworkJoinMode.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,34 +1,25 @@
 #include "CmdNetworkJoinMode.h"
 
-CmdNetworkJoinMode::CmdNetworkJoinMode(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Network Join Mode", "AT+NJM", "0: Manual configuration, 1: OTA Network Join, 2: Auto OTA Network Join on start up, 3: Peer-to-Peer (default: 1)"),
-        _serial(serial)
+CmdNetworkJoinMode::CmdNetworkJoinMode() :
+        Command("Network Join Mode", "AT+NJM", "0: Manual configuration, 1: OTA Network Join, 2: Auto OTA Network Join on start up, 3: Peer-to-Peer (default: 1)", "(0-3)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-3)";
     _queryable = true;
 }
 
 uint32_t CmdNetworkJoinMode::action(std::vector<std::string> args)
 {
-    if (args.size() == 1)
-    {
-        if (_dot->getVerbose())
-            _serial.writef("%s: ", name());
-
-        _serial.writef("%u\r\n", _dot->getJoinMode());
+    if (args.size() == 1) {
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getJoinMode());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         uint8_t mode = (args[1] == "1") ? 1 : 0;
         mode = (args[1] == "2" ? 2 : mode);
         mode = (args[1] == "3" ? 3 : mode);
-
-        if ((code = _dot->setJoinMode(mode)) != mDot::MDOT_OK)
+        
+        if (CommandTerminal::Dot()->setJoinMode(mode) != mDot::MDOT_OK)
         {
-            
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
 
@@ -46,13 +37,13 @@
     {
         if (!(args[1] == "0" || args[1] == "1" || args[1] == "2" || args[1] == "3"))
         {
-            setErrorMessage("Invalid parameter, expects (0: Manual, 1: OTA, 2: Auto OTA, 3:Peer-to-Peer)");
+            CommandTerminal::setErrorMessage("Invalid parameter, expects (0: Manual, 1: OTA, 2: Auto OTA, 3:Peer-to-Peer)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }