1 files changed, 10 insertions, 9 deletions

diff --git a/CommandTerminal/CmdTxDataRate.cpp b/CommandTerminal/CmdTxDataRate.cpp
index 004ee8e..fefbd69 100644
--- a/CommandTerminal/CmdTxDataRate.cpp
+++ b/CommandTerminal/CmdTxDataRate.cpp
@@ -26,10 +26,11 @@ CmdTxDataRate::CmdTxDataRate(mDot* dot, mts::MTSSerial& serial)
 {
     _help = std::string(text()) + ": " + std::string(desc());
 
-    if (_dot->getFrequencyBand() == mDot::FB_915)
-        _usage = "(7-10|DR0-DR4|DR8-DR13)";
-    else
+    if (_dot->getFrequencyBand() == mDot::FB_EU868)
         _usage = "(7-12|DR0-DR7)";
+    else
+        _usage = "(7-10|DR0-DR4|DR8-DR13)";
+
     _queryable = true;
 }
 
@@ -58,7 +59,7 @@ uint32_t CmdTxDataRate::action(std::vector<std::string> args) {
         } else {
             if (datarate > 6) {
                 // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
                     datarate = 10 - datarate;
                 } else {
                     datarate = 12 - datarate;
@@ -96,7 +97,7 @@ bool CmdTxDataRate::verify(std::vector<std::string> args) {
                     if (_dr > 15) {
                         _dr = 12 + (mDot::SF_12 - _dr);
 
-                        if (_dot->getFrequencyBand() == mDot::FB_868) {
+                        if (_dot->getFrequencyBand() == mDot::FB_EU868) {
                             if (_dr == mDot::SF_7H) {
                                 _dr =  mDot::DR6;
                             } else if (_dr ==  mDot::SF_FSK) {
@@ -115,13 +116,13 @@ bool CmdTxDataRate::verify(std::vector<std::string> args) {
                 }
             }
         } else {
-            if (_dot->getFrequencyBand() == mDot::FB_915 && datarate > 10) {
+            if ((_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915) && datarate > 10) {
                 datarate = -1;
-            } else if (_dot->getFrequencyBand() == mDot::FB_868 && datarate > 12) {
+            } else if (_dot->getFrequencyBand() == mDot::FB_EU868 && datarate > 12) {
                 datarate = -1;
             } else if (datarate > 6) {
                 // Convert SF to DR
-                if (_dot->getFrequencyBand() == mDot::FB_915) {
+                if (_dot->getFrequencyBand() == mDot::FB_US915 || _dot->getFrequencyBand() == mDot::FB_AU915 ) {
                     datarate = 10 - datarate;
                 } else {
                     datarate = 12 - datarate;
@@ -129,7 +130,7 @@ bool CmdTxDataRate::verify(std::vector<std::string> args) {
             }
         }
 
-        if (_dot->getFrequencyBand() == mDot::FB_915) {
+        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)");