MultiTech / Mbed OS MTDOT-BOX-EVB-Factory-Firmware-Custom

Dependencies:   DOGS102 GpsParser ISL29011 MMA845x MPL3115A2 MTS-Serial NCP5623B libmDot-Custom mDot_Channel_Plans

Fork of MTDOT-BOX-EVB-Factory-Firmware by MultiTech

Revision:
12:5b5e076b5f01
Parent:
7:a31236c2e75c
--- a/CommandTerminal/CmdTxDataRate.cpp	Thu Nov 10 22:10:58 2016 +0000
+++ b/CommandTerminal/CmdTxDataRate.cpp	Wed Nov 30 01:58:34 2016 +0000
@@ -25,12 +25,6 @@
   _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)";
-
     _queryable = true;
 }
 
@@ -56,15 +50,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) {
@@ -93,54 +78,10 @@
 
                 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;
-            }
         }
 
         return true;