Merge branch 'atcommands'

configuration needs to be pulled out of main and implemented as a Mode object

Conflicts:
	main.cpp

1 files changed, 55 insertions, 0 deletions

diff --git a/CommandTerminal/CmdNetworkJoinMode.cpp b/CommandTerminal/CmdNetworkJoinMode.cpp
new file mode 100644
index 0000000..b5efdf6
--- /dev/null
+++ b/CommandTerminal/CmdNetworkJoinMode.cpp
@@ -0,0 +1,55 @@
+#include "CmdNetworkJoinMode.h"
+
+CmdNetworkJoinMode::CmdNetworkJoinMode(mDot* dot, mts::MTSSerial& serial) :
+        Command(dot, "Network Join Mode", "AT+NJM", "0: Manual configuration, 1: OTA Network Join, 2: Auto OTA Network Join on start up (default: 1)"),
+        _serial(serial)
+{
+    _help = std::string(text()) + ": " + std::string(desc());
+    _usage = "(0-2)";
+    _queryable = true;
+}
+
+uint32_t CmdNetworkJoinMode::action(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+    {
+        if (_dot->getVerbose())
+            _serial.writef("%s: ", name());
+
+        _serial.writef("%u\r\n", _dot->getJoinMode());
+    }
+    else if (args.size() == 2)
+    {
+        int32_t code;
+        uint8_t mode = (args[1] == "1") ? 1 : 0;
+        mode = (args[1] == "2" ? 2 : mode);
+        if ((code = _dot->setJoinMode(mode)) != mDot::MDOT_OK)
+        {
+            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
+            setErrorMessage(error);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+bool CmdNetworkJoinMode::verify(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+        return true;
+
+    if (args.size() == 2)
+    {
+        if (!(args[1] == "0" || args[1] == "1" || args[1] == "2"))
+        {
+            setErrorMessage("Invalid parameter, expects (0: Manual, 1: OTA, 2: Auto OTA)");
+            return false;
+        }
+
+        return true;
+    }
+
+    setErrorMessage("Invalid arguments");
+    return false;
+}