Diff: CommandTerminal/CmdNetworkId.cpp

Revision:

9:ff62b20f7000

Parent:

1:e52ae6584f1c

Child:

14:f9a77400b622

--- a/CommandTerminal/CmdNetworkId.cpp	Mon Apr 04 13:17:44 2016 +0000
+++ b/CommandTerminal/CmdNetworkId.cpp	Mon Apr 04 09:00:31 2016 -0500
@@ -1,7 +1,7 @@
 #include "CmdNetworkId.h"
 
 CmdNetworkId::CmdNetworkId(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Network ID", "AT+NI", "Configured Network EUI/Name (App EUI in LoraMac) AT+NI=0,hex AT+NI=1,network_name  (Net ID = crc64(network_name)) (8 bytes)"),
+    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)
 {
     _help = std::string(text()) + ": " + std::string(desc());
@@ -16,7 +16,7 @@
         if (_dot->getVerbose())
             _serial.writef("Network ID: ");
 
-        _serial.writef("%s\r\n", mts::Text::bin2hexString(_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());
@@ -50,8 +50,8 @@
             }
             else
             {
-                std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-                setErrorMessage(error);
+                
+                setErrorMessage(_dot->getLastError());;
                 return 1;
             }
 
@@ -63,12 +63,12 @@
             if ((code = _dot->setNetworkId(NewKey)) == mDot::MDOT_OK)
             {
                 _serial.writef("Set Network ID: ");
-                _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, ".").c_str());
+                _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, "-").c_str());
             }
             else
             {
-                std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-                setErrorMessage(error);
+                
+                setErrorMessage(_dot->getLastError());;
                 return 1;
             }
         }