Diff: CommandTerminal/CmdRxFrequency.cpp

Revision:

16:d5cf2af81a6d

Parent:

14:f9a77400b622

--- a/CommandTerminal/CmdRxFrequency.cpp	Fri Nov 04 17:04:54 2016 -0500
+++ b/CommandTerminal/CmdRxFrequency.cpp	Mon Jun 19 14:33:21 2017 -0500
@@ -1,26 +1,26 @@
 #include "CmdRxFrequency.h"
 
-CmdRxFrequency::CmdRxFrequency() :
-    Command("Rx Frequency", "AT+RXF", "Set the Rx frequency for +RECV,+RECVC", "US:(0,902000000-928000000) EU:(0,863000000-870000000)")
+CmdRxFrequency::CmdRxFrequency()
+:
+  Command("Rx Frequency", "AT+RXF", "Set the Rx frequency for +RECV,+RECVC", "SEE PLAN")
 {
     _queryable = true;
 }
 
-uint32_t CmdRxFrequency::action(std::vector<std::string> args)
-{
-    if (args.size() == 1)
-    {
+uint32_t CmdRxFrequency::action(std::vector<std::string> args) {
+    if (args.size() == 1) {
         CommandTerminal::Serial()->writef("%lu\r\n", CommandTerminal::Dot()->getRxFrequency());
     }
     else if (args.size() == 2)
-    {
-        
+             {
+
         int frequency = 0;
         sscanf(args[1].c_str(), "%d", &frequency);
         if (CommandTerminal::Dot()->setRxFrequency(frequency) != mDot::MDOT_OK)
-        {
-            
-            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
+            {
+
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());
+            ;
             return 1;
         }
     }
@@ -28,28 +28,22 @@
     return 0;
 }
 
-bool CmdRxFrequency::verify(std::vector<std::string> args)
-{
+bool CmdRxFrequency::verify(std::vector<std::string> args) {
     if (args.size() == 1)
         return true;
 
     if (args.size() == 2)
-    {
+        {
         int frequency;
         if (sscanf(args[1].c_str(), "%d", &frequency) != 1) {
             CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
-
         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;
         }