Diff: CommandTerminal/CmdNetworkId.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdNetworkId.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdNetworkId.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,11 +1,8 @@
 #include "CmdNetworkId.h"
 
-CmdNetworkId::CmdNetworkId(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Network ID", "AT+NI", "Configured Network Name/EUI (MSB, App EUI in LoRaWAN) AT+NI=0,hex AT+NI=1,network_name  (Net ID = crc64(network_name)) (8 bytes)"),
-            _serial(serial)
+CmdNetworkId::CmdNetworkId() :
+    Command("Network ID", "AT+NI", "Configured Network Name/EUI (MSB, App EUI in LoRaWAN) AT+NI=0,hex AT+NI=1,network_name  (Net ID = crc64(network_name)) (8 bytes)", "(0,(hex:8)),(1,(string:128))")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,(hex:8)),(1,(string:128))";
     _queryable = true;
 }
 
@@ -13,17 +10,14 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Network ID: ");
+        CommandTerminal::Serial()->writef("%s\r\n", mts::Text::bin2hexString(CommandTerminal::Dot()->getNetworkId(), "-").c_str());
 
-        _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getNetworkId(), "-").c_str());
-
-        if (!_dot->getNetworkName().empty())
-            _serial.writef("Passphrase: '%s'\r\n", _dot->getNetworkName().c_str());
+        if (!CommandTerminal::Dot()->getNetworkName().empty())
+            CommandTerminal::Serial()->writef("Passphrase: '%s'\r\n", CommandTerminal::Dot()->getNetworkName().c_str());
     }
     else
     {
-        int32_t code;
+        
 
         if (args[1].find("1") == 0 && args[1].size() == 1)
         {
@@ -43,15 +37,14 @@
                 text = args[2];
             }
 
-            if ((code = _dot->setNetworkName(text)) == mDot::MDOT_OK)
+            if (CommandTerminal::Dot()->setNetworkName(text) == mDot::MDOT_OK)
             {
-                _serial.writef("Set Network Name: ");
-                _serial.writef("%s\r\n", text.c_str());
+                CommandTerminal::Serial()->writef("Set Network Name: ");
+                CommandTerminal::Serial()->writef("%s\r\n", text.c_str());
             }
             else
             {
-                
-                setErrorMessage(_dot->getLastError());;
+                CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
                 return 1;
             }
 
@@ -60,15 +53,14 @@
         {
             std::vector<uint8_t> NewKey;
             readByteArray(args[2], NewKey, EUI_LENGTH);
-            if ((code = _dot->setNetworkId(NewKey)) == mDot::MDOT_OK)
+            if (CommandTerminal::Dot()->setNetworkId(NewKey) == mDot::MDOT_OK)
             {
-                _serial.writef("Set Network ID: ");
-                _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, "-").c_str());
+                CommandTerminal::Serial()->writef("Set Network ID: ");
+                CommandTerminal::Serial()->writef("%s\r\n", mts::Text::bin2hexString(NewKey, "-").c_str());
             }
             else
             {
-                
-                setErrorMessage(_dot->getLastError());;
+                CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
                 return 1;
             }
         }
@@ -84,27 +76,27 @@
 
     if (args.size() == 3) {
         if (args[1] != "0" && args[1] != "1") {
-            setErrorMessage("Invalid type, expects (0,1)");
+            CommandTerminal::setErrorMessage("Invalid type, expects (0,1)");
             return false;
         }
         if (args[1] == "0" && !isHexString(args[2], 8)) {
-            setErrorMessage("Invalid ID, expects (hex:8");
+            CommandTerminal::setErrorMessage("Invalid ID, expects (hex:8");
             return false;
         }
 
         if (args[1] == "1" && args[2].size() < 8) {
-            setErrorMessage("Invalid name, expects minimum 8 characters");
+            CommandTerminal::setErrorMessage("Invalid name, expects minimum 8 characters");
             return false;
         }
 
         if (args[1] == "1" && args[2].size() > 128) {
-            setErrorMessage("Invalid name, expects (string:128)");
+            CommandTerminal::setErrorMessage("Invalid name, expects (string:128)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }