Diff: CommandTerminal/CmdRxDataRate.cpp

Revision:

9:ff62b20f7000

Parent:

1:e52ae6584f1c

Child:

14:f9a77400b622

diff -r a8be708e0e56 -r ff62b20f7000 CommandTerminal/CmdRxDataRate.cpp
--- a/CommandTerminal/CmdRxDataRate.cpp	Mon Apr 04 13:17:44 2016 +0000
+++ b/CommandTerminal/CmdRxDataRate.cpp	Mon Apr 04 09:00:31 2016 -0500
@@ -1,45 +1,54 @@
 #include "CmdRxDataRate.h"
 
-CmdRxDataRate::CmdRxDataRate(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Rx Data Rate", "AT+RXDR", "Set the Rx data rate"), _serial(serial)
+CmdRxDataRate::CmdRxDataRate(mDot* dot, mts::MTSSerial& serial)
+:
+  Command(dot, "Rx Data Rate", "AT+RXDR", "Set the Rx datarate, testing purposes only"),
+  _serial(serial)
 {
     _help = std::string(text()) + ": " + std::string(desc());
-    if (_dot->getFrequencyBand() == mDot::FB_915) 
-        _usage = "(7-10)";
+    if (_dot->getFrequencyBand() == mDot::FB_915)
+        _usage = "(7-10|DR0-DR4|DR8-DR13)";
     else
-        _usage = "(7-12)";
+        _usage = "(7-12|DR0-DR7)";
 
     _queryable = true;
 }
 
-uint32_t CmdRxDataRate::action(std::vector<std::string> args)
-{
-    if (args.size() == 1)
-    {
+uint32_t CmdRxDataRate::action(std::vector<std::string> args) {
+    if (args.size() == 1) {
         if (_dot->getVerbose())
             _serial.writef("Rx Data Rate: ");
 
         _serial.writef("%s\r\n", mDot::DataRateStr(_dot->getRxDataRate()).c_str());
     }
-    else if (args.size() == 2)
-    {
+    else if (args.size() == 2) {
+        std::string dr = mts::Text::toUpper(args[1]);
         int32_t code;
-        uint8_t datarate = 0;
+        int datarate = 0;
         uint8_t i;
 
-        for (i = 0; i < 8; i++)
-        {
-            if (mDot::DataRateStr(i).find(args[1].c_str()) != std::string::npos)
-            {
-                datarate = i;
-                break;
+        int res = sscanf(dr.c_str(), "%d", &datarate);
+
+        if (res == 0) {
+            for (i = 0; i < 24; i++) {
+                if (mDot::DataRateStr(i).find(dr) != std::string::npos) {
+                    datarate = i;
+                    break;
+                }
+            }
+        } else {
+            if (datarate > 6) {
+                // Convert SF to DR
+                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                    datarate = 10 - datarate;
+                } else {
+                    datarate = 12 - datarate;
+                }
             }
         }
 
-        if ((code = _dot->setRxDataRate(datarate)) != mDot::MDOT_OK)
-        {
-            std::string error = mDot::getReturnCodeString(code) + " - " + _dot->getLastError();
-            setErrorMessage(error);
+        if ((code = _dot->setRxDataRate(datarate)) != mDot::MDOT_OK) {
+            setErrorMessage(_dot->getLastError());;
             return 1;
         }
     }
@@ -47,36 +56,49 @@
     return 0;
 }
 
-bool CmdRxDataRate::verify(std::vector<std::string> args)
-{
+bool CmdRxDataRate::verify(std::vector<std::string> args) {
     if (args.size() == 1)
         return true;
 
-    if (args.size() == 2)
-    {
+    if (args.size() == 2) {
+        std::string dr = mts::Text::toUpper(args[1]);
+
         uint8_t i;
         int datarate = -1;
-        for (i = 0; i < 8; i++)
-        {
-            if (mDot::DataRateStr(i).find(args[1].c_str()) != std::string::npos)
-            {
-                datarate = i;
-                break;
+
+        int res = sscanf(dr.c_str(), "%d", &datarate);
+
+        if (res == 0) {
+            for (i = 0; i < 24; i++) {
+                if (mDot::DataRateStr(i).find(dr) != std::string::npos) {
+                    datarate = i;
+                    break;
+                }
+            }
+        } else {
+            if (_dot->getFrequencyBand() == mDot::FB_915 && datarate > 10) {
+                datarate = -1;
+            } else if (_dot->getFrequencyBand() == mDot::FB_868 && datarate > 12) {
+                datarate = -1;
+            } else if (datarate > 6) {
+                // Convert SF to DR
+                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                    datarate = 10 - datarate;
+                } else {
+                    datarate = 12 - datarate;
+                }
             }
         }
 
-        if (datarate < 0)
-        { 
-            if (_dot->getFrequencyBand() == mDot::FB_915) 
-                setErrorMessage("Invalid data rate, expects (7-10)");
-            else
-                setErrorMessage("Invalid data rate, expects (7-12)");
-            return false;
-        }
-
         if (_dot->getFrequencyBand() == mDot::FB_915) {
-            if (datarate < 2) {
-                setErrorMessage("Invalid data rate, expects (7-10)");
+            // DR8-13 used for P2P modes
+            if (datarate < 0 || datarate > 13 || (datarate >= 5 && datarate <= 7)) {
+                setErrorMessage("Invalid data rate, expects (7-10|DR0-DR4|DR8-DR13)");
+                return false;
+            }
+        } else {
+            if (datarate < 0 || datarate > 7) {
+                setErrorMessage("Invalid data rate, expects (7-12|DR0-DR7)");
                 return false;
             }
         }