Diff: CommandTerminal/CmdSendStringOnInterval.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdSendStringOnInterval.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdSendStringOnInterval.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,15 +1,13 @@
 #include "CmdSendStringOnInterval.h"
 #include "CommandTerminal.h"
 
-CmdSendStringOnInterval::CmdSendStringOnInterval(mDot* dot, mts::MTSSerial& serial)
-:
-  Command(dot, "Send On Interval", "AT+SENDI", "Sends supplied packet data on interval between sends, output any received packets (escape sequence: +++)"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(100-2147483647) ms,(string:242)";
+CmdSendStringOnInterval::CmdSendStringOnInterval()
+: Command("Send On Interval", "AT+SENDI", "Sends supplied packet data on interval between sends, output any received packets (escape sequence: +++)", "(1-2147483647) ms,(string:242)") {
+
 }
 
 uint32_t CmdSendStringOnInterval::action(std::vector<std::string> args) {
+    
     int32_t code;
     int interval;
     std::string text;
@@ -24,52 +22,59 @@
     std::vector<uint8_t> data(text.begin(), text.end());
 
     while (true) {
-        if (_dot->getJoinMode() == mDot::AUTO_OTA) {
+        if (CommandTerminal::Dot()->getJoinMode() == mDot::AUTO_OTA) {
             Timer timer;
             timer.start();
-            while (!_dot->getNetworkJoinStatus()) {
-                _serial.writef("Joining network... ");
-                if (_dot->joinNetworkOnce() == mDot::MDOT_OK) {
-                    _serial.writef("Network Joined\r\n");
+            while (!CommandTerminal::Dot()->getNetworkJoinStatus()) {
+                CommandTerminal::Serial()->writef("Joining network... ");
+                if (CommandTerminal::Dot()->joinNetworkOnce() == mDot::MDOT_OK) {
+                    CommandTerminal::Serial()->writef("Network Joined\r\n");
                 } else {
-                    _serial.writef("%s\r\n", _dot->getLastError().c_str());
+                    CommandTerminal::Serial()->writef("%s\r\n", CommandTerminal::Dot()->getLastError().c_str());
                 }
 
-                if (CommandTerminal::waitForEscape(_dot->getNextTxMs())) {
+                if (CommandTerminal::waitForEscape(CommandTerminal::Dot()->getNextTxMs())) {
                     return 0;
                 }
             }
-        } else if (!_dot->getNetworkJoinStatus()) {
-            setErrorMessage(mDot::getReturnCodeString(mDot::MDOT_NOT_JOINED));
+        } else if (!CommandTerminal::Dot()->getNetworkJoinStatus()) {
+            CommandTerminal::setErrorMessage(mDot::getReturnCodeString(mDot::MDOT_NOT_JOINED));
             return 1;
         }
 
-        if ((code = _dot->send(data, _dot->getTxWait())) != mDot::MDOT_OK) {
-            std::string error = _dot->getLastError();
+        if ((code = CommandTerminal::Dot()->send(data, CommandTerminal::Dot()->getTxWait())) != mDot::MDOT_OK) {
+            std::string error = CommandTerminal::Dot()->getLastError();
 
             if (code == mDot::MDOT_INVALID_PARAM) {
-                setErrorMessage(_dot->getLastError());;
+                CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
                 return 1;
             } else {
-                _serial.writef("%s\r\n", error.c_str());
+                CommandTerminal::Serial()->writef("%s\r\n", error.c_str());
             }
         }
 
         if (code == mDot::MDOT_OK) {
-            if (CommandTerminal::waitForEscape(3000, _dot, CommandTerminal::WAIT_SEND)) {
+            if (CommandTerminal::waitForEscape(3000, CommandTerminal::Dot(), CommandTerminal::WAIT_SEND)) {
                 return 0;
             }
 
-            if (_dot->getTxWait() || _dot->getAck() > 0) {
+            if (CommandTerminal::Dot()->getTxWait() || CommandTerminal::Dot()->getAck() > 0) {
                 std::vector<uint8_t> rx_data;
 
-                if (_dot->recv(rx_data) == mDot::MDOT_OK) {
+                if (CommandTerminal::Dot()->recv(rx_data) == mDot::MDOT_OK) {
                     if (!rx_data.empty()) {
-                        if (_dot->getVerbose())
-                            _serial.writef("Packet data:\r\n");
-                        _serial.writef("%s\r\n", CommandTerminal::formatPacketData(rx_data, _dot->getRxOutput()).c_str());
+                        if (CommandTerminal::Dot()->getRxOutput() == mDot::HEXADECIMAL) {
+                            for (size_t i = 0; i < data.size(); i++) {
+                                CommandTerminal::Serial()->writef("%02x", data[i]);
+                            }
+                            CommandTerminal::Serial()->writef("\r\n");
+                        } else {
+                            CommandTerminal::Serial()->writef("%s\r\n", CommandTerminal::formatPacketData(data, CommandTerminal::Dot()->getRxOutput()).c_str());
+                        }
                     }
                 }
+            } else if (!CommandTerminal::Dot()->getTxWait()) {
+                CommandTerminal::Dot()->cancelRxWindow();
             }
         }
 
@@ -87,25 +92,25 @@
         size_t size = 0;
 
         if (sscanf(args[1].c_str(), "%d", &interval) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
-        if (interval < 100 || interval > INT_MAX) {
-            setErrorMessage("Invalid interval, expects (100-2147483647) ms");
+        if (interval < 1 || interval > INT_MAX-1) {
+            CommandTerminal::setErrorMessage("Invalid interval, expects (1-2147483646) ms");
             return false;
         }
 
         for (size_t i = 2; i < args.size() - 1; i++)
             size += args[i].size() + 1;
         if (size > 242) {
-            setErrorMessage("Invalid packet, expects (string:242)");
+            CommandTerminal::setErrorMessage("Invalid packet, expects (string:242)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }