Diff: CommandTerminal/CmdNetworkLinkCheck.cpp

Revision:

14:f9a77400b622

Parent:

1:e52ae6584f1c

--- a/CommandTerminal/CmdNetworkLinkCheck.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdNetworkLinkCheck.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,29 +1,24 @@
 #include "CmdNetworkLinkCheck.h"
 #include "CommandTerminal.h"
 
-CmdNetworkLinkCheck::CmdNetworkLinkCheck(mDot* dot, mts::MTSSerial& serial)
+CmdNetworkLinkCheck::CmdNetworkLinkCheck()
 :
-  Command(dot, "Network Link Check", "AT+NLC", "Perform network link check, displays dBm above floor, number of gateways in range and optional packet payload if received"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(-20.0-20.0),(1-)";
+  Command("Network Link Check", "AT+NLC", "Perform network link check, displays dBm above floor, number of gateways in range and optional packet payload if received", "(-20.0-20.0),(1-)") {
+
 }
 
 uint32_t CmdNetworkLinkCheck::action(std::vector<std::string> args) {
     mDot::link_check lc;
 
-    lc = _dot->networkLinkCheck();
+    lc = CommandTerminal::Dot()->networkLinkCheck();
     if (lc.status) {
-        if (_dot->getVerbose())
-            _serial.writef("%s:", name());
-
-        _serial.writef("%d,%lu\r\n", lc.dBm, lc.gateways);
+        CommandTerminal::Serial()->writef("%d,%lu\r\n", lc.dBm, lc.gateways);
 
         if (!lc.payload.empty())
-            _serial.writef("%s\r\n", CommandTerminal::formatPacketData(lc.payload, _dot->getRxOutput()).c_str());
+            CommandTerminal::Serial()->writef("%s\r\n", CommandTerminal::formatPacketData(lc.payload, CommandTerminal::Dot()->getRxOutput()).c_str());
 
     } else {
-        setErrorMessage(_dot->getLastError());
+        CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());
         return 1;
     }