Diff: CommandTerminal/CmdACKAttempts.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdACKAttempts.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdACKAttempts.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdACKAttempts.h"
 
-CmdACKAttempts::CmdACKAttempts(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Require ACK", "AT+ACK", "Enable to require send acknowledgement (0: off, N: number of attempts until ACK recevied)"), _serial(serial)
+CmdACKAttempts::CmdACKAttempts() :
+        Command("Require ACK", "AT+ACK", "Enable to require send acknowledgement (0: off, N: number of attempts until ACK received)", "(0-8)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-8)";
     _queryable = true;
 }
 
@@ -12,20 +10,16 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("ACK Attempts: ");
-
-        _serial.writef("%u\r\n", _dot->getAck());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getAck());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         int retries;
         sscanf(args[1].c_str(), "%d", &retries);
 
-        if ((code = _dot->setAck(retries)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setAck(retries) != mDot::MDOT_OK)
         {
-            setErrorMessage(_dot->getLastError());
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());
             return 1;
         }
     }
@@ -42,18 +36,18 @@
     {
         int retries;
         if (sscanf(args[1].c_str(), "%d", &retries) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
         if (retries < 0 || retries > 8) {
-            setErrorMessage("Invalid attempts, expects (0-8)");
+            CommandTerminal::setErrorMessage("Invalid attempts, expects (0-8)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }