From f484beed77531d7ef2da65cf049fe9c4ac6b7d08 Mon Sep 17 00:00:00 2001
From: Leon Lindenfelser <llindenfelser@multitech.com>
Date: Mon, 16 Nov 2015 16:18:09 -0600
Subject: Added all the new dotbox commands with some detail work still needed

---
 CommandTerminal/CmdMaximumPower.cpp | 62 +++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 CommandTerminal/CmdMaximumPower.cpp

(limited to 'CommandTerminal/CmdMaximumPower.cpp')

diff --git a/CommandTerminal/CmdMaximumPower.cpp b/CommandTerminal/CmdMaximumPower.cpp
new file mode 100644
index 0000000..832fbfb
--- /dev/null
+++ b/CommandTerminal/CmdMaximumPower.cpp
@@ -0,0 +1,62 @@
+#include "CmdMaximumPower.h"
+
+CmdMaximumPower::CmdMaximumPower(mDot* dot, mts::MTSSerial& serial) :
+        Command(dot, "Maximum Power", "AT+MAXPWR", "Set the maximum transmit power for sweep survey mode"), _serial(serial)
+{
+    _help = std::string(text()) + ": " + std::string(desc());
+    _usage = "(2-20)";
+    _queryable = true;
+}
+
+uint32_t CmdMaximumPower::action(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+    {
+        if (_dot->getVerbose())
+            _serial.writef("Maximum Power: ");
+//ToDo: Change from _dot->getTxPower() to the structure we will use for this.
+        _serial.writef("%lu\r\n", _dot->getTxPower());
+    }
+    else if (args.size() == 2)
+    {
+        int32_t code;
+        uint32_t power = 0;
+        sscanf(args[1].c_str(), "%lu", &power);
+
+        if ((code = _dot->setTxPower(power)) != mDot::MDOT_OK)
+        {
+            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
+            setErrorMessage(error);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+bool CmdMaximumPower::verify(std::vector<std::string> args)
+{
+    if (args.size() == 1)
+        return true;
+
+    if (args.size() == 2)
+    {
+        uint32_t power = 0;
+        if (sscanf(args[1].c_str(), "%lu", &power) != 1) {
+            setErrorMessage("Invalid argument");
+            return false;
+        }
+
+        if (power < 2 || power > 20)
+        {
+            setErrorMessage("Invalid maximum transmit power for sweep survey mode, expects (2-20)");
+            return false;
+        }
+//ToDo: Output warning if < minimum size.
+        return true;
+    }
+
+    setErrorMessage("Invalid arguments");
+    return false;
+}
+
-- 
cgit v1.2.3


From ce5c78c53be8d66da4a2cccdf18b622c0b77e773 Mon Sep 17 00:00:00 2001
From: Leon Lindenfelser <llindenfelser@multitech.com>
Date: Wed, 18 Nov 2015 11:16:11 -0600
Subject: Added functionality to get the guts of these commands working with
 storage mapped into unused mDot commands. Over write the mDot defaults in
 these storage locations with the appropriate defaults for these 5 commands.

---
 CommandTerminal/CmdMaximumPower.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'CommandTerminal/CmdMaximumPower.cpp')

diff --git a/CommandTerminal/CmdMaximumPower.cpp b/CommandTerminal/CmdMaximumPower.cpp
index 832fbfb..d12c11f 100644
--- a/CommandTerminal/CmdMaximumPower.cpp
+++ b/CommandTerminal/CmdMaximumPower.cpp
@@ -1,5 +1,7 @@
 #include "CmdMaximumPower.h"
 
+//SPECIAL NOTE: Maximum power is stored in the LoraConfig WakeMode field. We decided to use 5 LoRaConfig locations,
+// that are not used for the DotBox, for the 5 DotBox settings... +minsize, +maxsize, +minpwr, +maxpwr and +data.
 CmdMaximumPower::CmdMaximumPower(mDot* dot, mts::MTSSerial& serial) :
         Command(dot, "Maximum Power", "AT+MAXPWR", "Set the maximum transmit power for sweep survey mode"), _serial(serial)
 {
@@ -14,16 +16,14 @@ uint32_t CmdMaximumPower::action(std::vector<std::string> args)
     {
         if (_dot->getVerbose())
             _serial.writef("Maximum Power: ");
-//ToDo: Change from _dot->getTxPower() to the structure we will use for this.
-        _serial.writef("%lu\r\n", _dot->getTxPower());
+        _serial.writef("%lu\r\n", _dot->getWakeMode());
     }
     else if (args.size() == 2)
     {
         int32_t code;
         uint32_t power = 0;
         sscanf(args[1].c_str(), "%lu", &power);
-
-        if ((code = _dot->setTxPower(power)) != mDot::MDOT_OK)
+        if ((code = _dot->setWakeMode(power)) != mDot::MDOT_OK)
         {
             std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
             setErrorMessage(error);
@@ -52,7 +52,12 @@ bool CmdMaximumPower::verify(std::vector<std::string> args)
             setErrorMessage("Invalid maximum transmit power for sweep survey mode, expects (2-20)");
             return false;
         }
-//ToDo: Output warning if < minimum size.
+        if (power < _dot->getWakeTimeout())	//WakeTimeout holds the MinPower setting.
+        {
+            setErrorMessage("+MAXPWR cannot be less than +MINPWR. Please decrease +MINPWR first.");
+            return false;
+        }
+
         return true;
     }
 
-- 
cgit v1.2.3