Diff: CommandTerminal/CmdRxDataRate.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

Child:

16:d5cf2af81a6d

--- a/CommandTerminal/CmdRxDataRate.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdRxDataRate.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,29 +1,20 @@
 #include "CmdRxDataRate.h"
 
-CmdRxDataRate::CmdRxDataRate(mDot* dot, mts::MTSSerial& serial)
+CmdRxDataRate::CmdRxDataRate()
 :
-  Command(dot, "Rx Data Rate", "AT+RXDR", "Set the Rx datarate, testing purposes only"),
-  _serial(serial)
+  Command("Rx Data Rate", "AT+RXDR", "Set the Rx datarate, testing purposes only", "US:(7-10|DR0-DR4|DR8-DR13)) EU:(7-12|DR0-DR7))")
+  
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    if (_dot->getFrequencyBand() == mDot::FB_915)
-        _usage = "(7-10|DR0-DR4|DR8-DR13)";
-    else
-        _usage = "(7-12|DR0-DR7)";
-
     _queryable = true;
 }
 
 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());
+        CommandTerminal::Serial()->writef("%s\r\n", mDot::DataRateStr(CommandTerminal::Dot()->getRxDataRate()).c_str());
     }
     else if (args.size() == 2) {
         std::string dr = mts::Text::toUpper(args[1]);
-        int32_t code;
+        
         int datarate = 0;
         uint8_t i;
 
@@ -39,7 +30,7 @@
         } else {
             if (datarate > 6) {
                 // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915 || CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) {
                     datarate = 10 - datarate;
                 } else {
                     datarate = 12 - datarate;
@@ -47,8 +38,8 @@
             }
         }
 
-        if ((code = _dot->setRxDataRate(datarate)) != mDot::MDOT_OK) {
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setRxDataRate(datarate) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -76,13 +67,14 @@
                 }
             }
         } else {
-            if (_dot->getFrequencyBand() == mDot::FB_915 && datarate > 10) {
+
+            if ((CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915  || CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915 ) && datarate > 10) {
                 datarate = -1;
-            } else if (_dot->getFrequencyBand() == mDot::FB_868 && datarate > 12) {
+            } else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_EU868 && datarate > 12) {
                 datarate = -1;
             } else if (datarate > 6) {
                 // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915 || CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) {
                     datarate = 10 - datarate;
                 } else {
                     datarate = 12 - datarate;
@@ -90,15 +82,15 @@
             }
         }
 
-        if (_dot->getFrequencyBand() == mDot::FB_915) {
+        if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_US915 || CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915) {
             // 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)");
+                CommandTerminal::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)");
+                CommandTerminal::setErrorMessage("Invalid data rate, expects (7-12|DR0-DR7)");
                 return false;
             }
         }
@@ -106,6 +98,6 @@
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }