Diff: CommandTerminal/CmdRxOutput.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdRxOutput.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdRxOutput.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdRxOutput.h"
 
-CmdRxOutput::CmdRxOutput(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Rx Output", "AT+RXO", "Set the Rx output type (0:hexadecimal, 1:raw)"), _serial(serial)
+CmdRxOutput::CmdRxOutput() :
+        Command("Rx Output", "AT+RXO", "Set the Rx output type (0:hexadecimal, 1:raw)", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
@@ -12,19 +10,16 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Rx Output: ");
-
-        _serial.writef("%u\r\n", _dot->getRxOutput());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getRxOutput());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
+        
         uint8_t output = args[1] == "0" ? 0 : 1;
-        if ((code = _dot->setRxOutput(output)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setRxOutput(output) != mDot::MDOT_OK)
         {
             
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -40,13 +35,13 @@
     if (args.size() == 2)
     {
         if (!(args[1] == "0" || args[1] == "1")) {
-            setErrorMessage("Invalid type, expects (0:hexadecimal, 1:raw)");
+            CommandTerminal::setErrorMessage("Invalid type, expects (0:hexadecimal, 1:raw)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }