Diff: CommandTerminal/CmdTxDataRate.cpp

Revision:

12:05435282f899

Parent:

7:a31236c2e75c

--- a/CommandTerminal/CmdTxDataRate.cpp	Thu Nov 10 22:10:58 2016 +0000
+++ b/CommandTerminal/CmdTxDataRate.cpp	Tue Oct 09 13:49:30 2018 -0500
@@ -25,21 +25,13 @@
   _serial(serial)
 {
     _help = std::string(text()) + ": " + std::string(desc());
-
-    if (_dot->getFrequencyBand() == mDot::FB_EU868)
-        _usage = "(7-12|DR0-DR7)";
-    else
-        _usage = "(7-10|DR0-DR4|DR8-DR13)";
-
+    _usage = "7-10|DR0-DR15, Depends on Channel Plan";
     _queryable = true;
 }
 
 uint32_t CmdTxDataRate::action(std::vector<std::string> args) {
     if (args.size() == 1)
         {
-        if (_dot->getVerbose())
-            _serial.writef("Tx Data Rate: ");
-
         _serial.writef("DR%d - %s\r\n", _dot->getTxDataRate(), _dot->getDateRateDetails(_dot->getTxDataRate()).c_str());
     } else if (args.size() == 2) {
         std::string dr = mts::Text::toUpper(args[1]);
@@ -56,15 +48,6 @@
                     break;
                 }
             }
-        } else {
-            if (datarate > 6) {
-                // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
-                    datarate = 10 - datarate;
-                } else {
-                    datarate = 12 - datarate;
-                }
-            }
         }
 
         if ((code = _dot->setTxDataRate(datarate)) != mDot::MDOT_OK) {
@@ -80,71 +63,8 @@
     if (args.size() == 1)
         return true;
 
-    if (args.size() == 2) {
-        std::string dr = mts::Text::toUpper(args[1]);
-
-        uint8_t i;
-        int datarate = -1;
-
-        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) {
-                    uint8_t _dr = i;
-
-                    if (_dr > 15) {
-                        _dr = 12 + (mDot::SF_12 - _dr);
-
-                        if (_dot->getFrequencyBand() == mDot::FB_EU868) {
-                            if (_dr == mDot::SF_7H) {
-                                _dr =  mDot::DR6;
-                            } else if (_dr ==  mDot::SF_FSK) {
-                                _dr =  mDot::DR7;
-                            } else {
-                                _dr = 12 - _dr;
-                            }
-                        } else {
-
-                            _dr = 10 - _dr;
-                        }
-                    }
-
-                    datarate = _dr;
-                    break;
-                }
-            }
-        } else {
-            if ((_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915) && datarate > 10) {
-                datarate = -1;
-            } else if (_dot->getFrequencyBand() == mDot::FB_EU868 && datarate > 12) {
-                datarate = -1;
-            } else if (datarate > 6) {
-                // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
-                    datarate = 10 - datarate;
-                } else {
-                    datarate = 12 - datarate;
-                }
-            }
-        }
-
-        if (_dot->getFrequencyBand() == mDot::FB_US915 || _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)");
-                return false;
-            }
-        } else {
-            if (datarate < 0 || datarate > 7) {
-                setErrorMessage("Invalid data rate, expects (7-12|DR0-DR7)");
-                return false;
-            }
-        }
-
+    if (args.size() == 2)
         return true;
-    }
 
     setErrorMessage("Invalid arguments");
     return false;