Diff: CommandTerminal/CmdRepeat.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdRepeat.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdRepeat.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdRepeat.h"
 
-CmdRepeat::CmdRepeat(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Packet Repeats", "AT+REP", "Configure number of times to repeat a packet"), _serial(serial)
+CmdRepeat::CmdRepeat() :
+        Command("Packet Repeats", "AT+REP", "Configure number of times to repeat a packet", "(0-15)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-15)";
     _queryable = true;
 }
 
@@ -12,21 +10,16 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Packet Repeats: ");
-
-        _serial.writef("%u\r\n", _dot->getRepeat());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getRepeat());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         int repeat;
         sscanf(args[1].c_str(), "%d", &repeat);
 
-        if ((code = _dot->setRepeat(repeat)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setRepeat(repeat) != mDot::MDOT_OK)
         {
-            
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -43,19 +36,19 @@
     {
         int repeat;
         if (sscanf(args[1].c_str(), "%d", &repeat) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
         if (repeat < 0 || repeat > 15)
         {
-            setErrorMessage("Invalid repeats, expects (0-15)");
+            CommandTerminal::setErrorMessage("Invalid repeats, expects (0-15)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }