Diff: CommandTerminal/CmdJoinRetries.cpp

Revision:

9:ff62b20f7000

Parent:

1:e52ae6584f1c

--- a/CommandTerminal/CmdJoinRetries.cpp	Mon Apr 04 13:17:44 2016 +0000
+++ b/CommandTerminal/CmdJoinRetries.cpp	Mon Apr 04 09:00:31 2016 -0500
@@ -2,7 +2,7 @@
 
 CmdJoinRetries::CmdJoinRetries(mDot* dot, mts::MTSSerial& serial)
 :
-  Command(dot, "Join Retries", "AT+JR", "Number of times to retry joining the network in an attempt (0 - 255)"),
+  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)";
@@ -17,12 +17,12 @@
         _serial.writef("%u\r\n", _dot->getJoinRetries());
     } else if (args.size() == 2) {
         int32_t code;
-        uint32_t retries;
-        sscanf(args[1].c_str(), "%lu", &retries);
+        int retries;
+        sscanf(args[1].c_str(), "%d", &retries);
 
         if ((code = _dot->setJoinRetries(retries)) != mDot::MDOT_OK) {
-            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-            setErrorMessage(error);
+            
+            setErrorMessage(_dot->getLastError());;
             return 1;
         }
     }
@@ -35,9 +35,9 @@
 
     if (args.size() == 2) {
 
-        uint32_t retries;
-        if (sscanf(args[1].c_str(), "%lu", &retries) == 1) {
-            if (retries > 255) {
+        int retries;
+        if (sscanf(args[1].c_str(), "%d", &retries) == 1) {
+            if (retries < 0 || retries > 255) {
                 setErrorMessage("Invalid retries, expects (0-255)");
                 return false;
             }