Diff: CommandTerminal/CmdTxFrequency.cpp

Revision:

16:d5cf2af81a6d

Parent:

14:f9a77400b622

--- a/CommandTerminal/CmdTxFrequency.cpp	Fri Nov 04 17:04:54 2016 -0500
+++ b/CommandTerminal/CmdTxFrequency.cpp	Mon Jun 19 14:33:21 2017 -0500
@@ -3,7 +3,7 @@
 
 
 CmdTxFrequency::CmdTxFrequency() :
-    Command("Tx Frequency", "AT+TXF", "Set Tx frequency", "US:(0,902000000-928000000), AU:(0, 915000000-928000000), EU:(0,863000000-870000000)") {
+    Command("Tx Frequency", "AT+TXF", "Set Tx frequency", "SEE PLAN") {
     _queryable = true;
 }
 
@@ -42,13 +42,9 @@
         }
 
         if (frequency != 0 && (frequency < int(CommandTerminal::Dot()->getMinFrequency()) || frequency > int(CommandTerminal::Dot()->getMaxFrequency()))) {
-            if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_EU868)
-                CommandTerminal::setErrorMessage("Invalid frequency, expects (0,863000000-870000000)"); 
-            else if (CommandTerminal::Dot()->getFrequencyBand() == mDot::FB_AU915)
-                CommandTerminal::setErrorMessage("Invalid frequency, expects (0,915000000-928000000)");
-            else
-                CommandTerminal::setErrorMessage("Invalid frequency, expects (0,902000000-928000000)");
-
+            char tmp[256];
+            sprintf(tmp, "Invalid frequency, expects (0,%lu-%lu)", CommandTerminal::Dot()->getMinFrequency(), CommandTerminal::Dot()->getMaxFrequency());
+            CommandTerminal::setErrorMessage(tmp);
             return false;
         }