Diff: CommandTerminal/CmdUplinkCounter.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdUplinkCounter.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdUplinkCounter.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,27 +1,21 @@
 #include "CmdUplinkCounter.h"
 
-CmdUplinkCounter::CmdUplinkCounter(mDot* dot, mts::MTSSerial& serial)
-:
-  Command(dot, "Uplink Counter", "AT+ULC", "Get or set the uplink counter for the next packet"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-4294967295)";
+CmdUplinkCounter::CmdUplinkCounter()
+: Command("Uplink Counter", "AT+ULC", "Get or set the uplink counter for the next packet", "(0-4294967295)")
+   {
     _queryable = true;
 }
 
 uint32_t CmdUplinkCounter::action(std::vector<std::string> args) {
     if (args.size() == 1) {
-        if (_dot->getVerbose())
-            _serial.writef("Uplink Counter: ");
-
-        _serial.writef("%u\r\n", _dot->getUpLinkCounter());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getUpLinkCounter());
     } else if (args.size() == 2) {
-        int32_t code;
+        
         int count;
         sscanf(args[1].c_str(), "%d", &count);
 
-        if ((code = _dot->setUpLinkCounter(count)) != mDot::MDOT_OK) {
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setUpLinkCounter(count) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -37,14 +31,14 @@
         int count;
         if (sscanf(args[1].c_str(), "%d", &count) == 1) {
             if (count > 4294967295) {
-                setErrorMessage("Invalid uplink counter, expects (0-4294967295)");
+                CommandTerminal::setErrorMessage("Invalid uplink counter, expects (0-4294967295)");
                 return false;
             }
             return true;
         }
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }