Diff: CommandTerminal/CmdAdaptiveDataRate.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdAdaptiveDataRate.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdAdaptiveDataRate.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,11 +1,9 @@
 #include "CmdAdaptiveDataRate.h"
 
 
-CmdAdaptiveDataRate::CmdAdaptiveDataRate(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Adaptive Data Rate", "AT+ADR", "Enable/disable Adaptive Data Rate (0: off, 1: on)"), _serial(serial)
+CmdAdaptiveDataRate::CmdAdaptiveDataRate() :
+        Command("Adaptive Data Rate", "AT+ADR", "Enable/disable Adaptive Data Rate (0: off, 1: on)", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
@@ -13,18 +11,14 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Adaptive Data Rate: ");
-
-        _serial.writef("%d\r\n", _dot->getAdr());
+        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getAdr());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         bool enable = (args[1] == "1");
-        if ((code = _dot->setAdr(enable)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setAdr(enable) != mDot::MDOT_OK)
         {
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -40,13 +34,13 @@
     if (args.size() == 2)
     {
         if (args[1] != "1" && args[1] != "0") {
-            setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
+            CommandTerminal::setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }