Diff: CommandTerminal/CmdJoinRetries.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdJoinRetries.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdJoinRetries.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,28 +1,21 @@
 #include "CmdJoinRetries.h"
 
-CmdJoinRetries::CmdJoinRetries(mDot* dot, mts::MTSSerial& serial)
+CmdJoinRetries::CmdJoinRetries()
 :
-  Command(dot, "Join Retries", "AT+JR", "US915 AUTO_OTA Frequency sub-band search retries (0:disable,1-255:attempts)"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-255)";
+  Command("Join Retries", "AT+JR", "US915/AU915 AUTO_OTA Frequency sub-band search retries (0:disable,1-255:attempts)", "(0-255)") {
     _queryable = true;
 }
 
 uint32_t CmdJoinRetries::action(std::vector<std::string> args) {
     if (args.size() == 1) {
-        if (_dot->getVerbose())
-            _serial.writef("Join Retries: ");
-
-        _serial.writef("%u\r\n", _dot->getJoinRetries());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getJoinRetries());
     } else if (args.size() == 2) {
-        int32_t code;
+        
         int retries;
         sscanf(args[1].c_str(), "%d", &retries);
 
-        if ((code = _dot->setJoinRetries(retries)) != mDot::MDOT_OK) {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setJoinRetries(retries) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -38,14 +31,14 @@
         int retries;
         if (sscanf(args[1].c_str(), "%d", &retries) == 1) {
             if (retries < 0 || retries > 255) {
-                setErrorMessage("Invalid retries, expects (0-255)");
+                CommandTerminal::setErrorMessage("Invalid retries, expects (0-255)");
                 return false;
             }
             return true;
         }
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }