Diff: CommandTerminal/CmdJoinRequest.cpp

Revision:

9:ff62b20f7000

Parent:

1:e52ae6584f1c

Child:

14:f9a77400b622

--- a/CommandTerminal/CmdJoinRequest.cpp	Mon Apr 04 13:17:44 2016 +0000
+++ b/CommandTerminal/CmdJoinRequest.cpp	Mon Apr 04 09:00:31 2016 -0500
@@ -12,11 +12,15 @@
 uint32_t CmdJoinRequest::action(std::vector<std::string> args) {
     int32_t code;
     std::string buf;
-    char ch;
 
     if (args.size() > 1 && args[1] == "1")
         _dot->resetNetworkSession();
 
+    if (_dot->getJoinMode() == 0) {
+        _serial.writef("Join not necessary for Manual Join Mode\r\n");
+        return 0;
+    }
+
     code = _dot->joinNetworkOnce();
 
     if (code == mDot::MDOT_OK) {
@@ -24,7 +28,7 @@
         return 0;
     } else {
         std::string error = mDot::getReturnCodeString(code)  + " - " + _dot->getLastError();
-        setErrorMessage(error);
+        setErrorMessage(_dot->getLastError());;
     }
 
     return 1;