Diff: CommandTerminal/CmdDownlinkCounter.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

diff -r b0f5ae12dc05 -r f9a77400b622 CommandTerminal/CmdDownlinkCounter.cpp
--- a/CommandTerminal/CmdDownlinkCounter.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdDownlinkCounter.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,28 +1,21 @@
 #include "CmdDownlinkCounter.h"
 
-CmdDownlinkCounter::CmdDownlinkCounter(mDot* dot, mts::MTSSerial& serial)
+CmdDownlinkCounter::CmdDownlinkCounter()
 :
-  Command(dot, "Downlink Counter", "AT+DLC", "Get or set the downlink counter"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-4294967295)";
+  Command("Downlink Counter", "AT+DLC", "Get or set the downlink counter", "(0-4294967295)") {
+
     _queryable = true;
 }
 
 uint32_t CmdDownlinkCounter::action(std::vector<std::string> args) {
     if (args.size() == 1) {
-        if (_dot->getVerbose())
-            _serial.writef("Downlink Counter: ");
-
-        _serial.writef("%u\r\n", _dot->getDownLinkCounter());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getDownLinkCounter());
     } else if (args.size() == 2) {
-        int32_t code;
-        uint32_t count;
+                uint32_t count;
         sscanf(args[1].c_str(), "%lu", &count);
 
-        if ((code = _dot->setDownLinkCounter(count)) != mDot::MDOT_OK) {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setDownLinkCounter(count) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -41,7 +34,7 @@
         }
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }