Diff: CommandTerminal/CmdWakeDelay.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdWakeDelay.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdWakeDelay.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,11 +1,8 @@
 #include "CmdWakeDelay.h"
 
-CmdWakeDelay::CmdWakeDelay(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Wake Delay", "AT+WD", "Time to wait for data after wakeup signal  (milliseconds)"),
-        _serial(serial)
+CmdWakeDelay::CmdWakeDelay() :
+        Command("Wake Delay", "AT+WD", "Time to wait for data after wakeup signal  (milliseconds)", "(2-2147483646) ms")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(2-2147483647) ms";
     _queryable = true;
 }
 
@@ -13,19 +10,15 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("%s: ", name());
-
-        _serial.writef("%lu\r\n", _dot->getWakeDelay());
+        CommandTerminal::Serial()->writef("%lu\r\n", CommandTerminal::Dot()->getWakeDelay());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         int delay;
         sscanf(args[1].c_str(), "%d", &delay);
 
-        if ((code = _dot->setWakeDelay(delay)) != mDot::MDOT_OK) {
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setWakeDelay(delay) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -42,18 +35,18 @@
     {
         int delay;
         if (sscanf(args[1].c_str(), "%d", &delay) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
-        if (delay < 2 || delay > INT_MAX) {
-            setErrorMessage("Invalid delay, expects (2-2147483647) ms");
+        if (delay < 2 || delay > INT_MAX-1) {
+            CommandTerminal::setErrorMessage("Invalid delay, expects (2-2147483646) ms");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }