Diff: CommandTerminal/CmdDataSessionKey.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

diff -r b0f5ae12dc05 -r f9a77400b622 CommandTerminal/CmdDataSessionKey.cpp
--- a/CommandTerminal/CmdDataSessionKey.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdDataSessionKey.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,35 +1,30 @@
 #include "CmdDataSessionKey.h"
 
-CmdDataSessionKey::CmdDataSessionKey(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Data Session Key", "AT+DSK", "Data session encryption key (16 bytes)"), _serial(serial)
+CmdDataSessionKey::CmdDataSessionKey() :
+    Command("Data Session Key", "AT+DSK", "Data session encryption key (16 bytes)", "(hex:16)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(hex:16)";
     _queryable = true;
 }
 
 uint32_t CmdDataSessionKey::action(std::vector<std::string> args)
 {
     if (args.size() == 1)
-    {
-        if (_dot->getVerbose())
-            _serial.writef("Data Session Key: ");
-        _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getDataSessionKey(), ".").c_str());
+    {;
+        CommandTerminal::Serial()->writef("%s\r\n", mts::Text::bin2hexString(CommandTerminal::Dot()->getDataSessionKey(), ".").c_str());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
+        
         std::vector<uint8_t> NewKey;
 
         // Read in the key components...
         readByteArray(args[1], NewKey, KEY_LENGTH);
 
-        if ((code = _dot->setDataSessionKey(NewKey)) == mDot::MDOT_OK) {
-            _serial.writef("Set Data Session Key: ");
-            _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, ".").c_str());
+        if (CommandTerminal::Dot()->setDataSessionKey(NewKey) == mDot::MDOT_OK) {
+            CommandTerminal::Serial()->writef("Set Data Session Key: ");
+            CommandTerminal::Serial()->writef("%s\r\n", mts::Text::bin2hexString(NewKey, ".").c_str());
         } else {
-            
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -44,13 +39,13 @@
 
     if (args.size() == 2) {
         if (!isHexString(args[1], 16)) {
-            setErrorMessage("Invalid key, expects (hex:16)");
+            CommandTerminal::setErrorMessage("Invalid key, expects (hex:16)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }