dev
Dependencies: MTS-Serial libmDot-mbed5
Fork of Dot-AT-Firmware by
Diff: CommandTerminal/CmdNetworkSessionKey.cpp
- Revision:
- 14:f9a77400b622
- Parent:
- 9:ff62b20f7000
--- a/CommandTerminal/CmdNetworkSessionKey.cpp Fri Nov 04 19:10:24 2016 +0000 +++ b/CommandTerminal/CmdNetworkSessionKey.cpp Fri Nov 04 14:25:43 2016 -0500 @@ -1,10 +1,8 @@ #include "CmdNetworkSessionKey.h" -CmdNetworkSessionKey::CmdNetworkSessionKey(mDot* dot, mts::MTSSerial& serial) : - Command(dot, "Network Session Key", "AT+NSK", "Network session encryption key (16 bytes)"), _serial(serial) +CmdNetworkSessionKey::CmdNetworkSessionKey() : + Command("Network Session Key", "AT+NSK", "Network session encryption key (16 bytes)", "(hex:16)") { - _help = std::string(text()) + ": " + std::string(desc()); - _usage = "(hex:16)"; _queryable = true; } @@ -12,25 +10,21 @@ { if (args.size() == 1) { - if (_dot->getVerbose()) - _serial.writef("Network Session Key: "); - - _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getNetworkSessionKey(), ".").c_str()); + CommandTerminal::Serial()->writef("%s\r\n", mts::Text::bin2hexString(CommandTerminal::Dot()->getNetworkSessionKey(), ".").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->setNetworkSessionKey(NewKey)) == mDot::MDOT_OK) { - _serial.writef("Set Network Session Key: "); - _serial.writef("%s\r\n", mts::Text::bin2hexString(NewKey, ".").c_str()); + if (CommandTerminal::Dot()->setNetworkSessionKey(NewKey) == mDot::MDOT_OK) { + CommandTerminal::Serial()->writef("Set Network 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; } } @@ -45,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; }