Diff: CommandTerminal/CmdRxFrequency.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdRxFrequency.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdRxFrequency.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,13 +1,8 @@
 #include "CmdRxFrequency.h"
 
-CmdRxFrequency::CmdRxFrequency(mDot* dot, mts::MTSSerial& serial) :
-    Command(dot, "Rx Frequency", "AT+RXF", "Set the Rx frequency for +RECV,+RECVC"), _serial(serial)
+CmdRxFrequency::CmdRxFrequency() :
+    Command("Rx Frequency", "AT+RXF", "Set the Rx frequency for +RECV,+RECVC", "US:(0,902000000-928000000) EU:(0,863000000-870000000)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    if (_dot->getFrequencyBand() == mDot::FB_868)
-        _usage = "(0,863000000-870000000)";
-    else
-        _usage = "(0,902000000-928000000)";
     _queryable = true;
 }
 
@@ -15,20 +10,17 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Rx Frequency: ");
-
-        _serial.writef("%lu\r\n", _dot->getRxFrequency());
+        CommandTerminal::Serial()->writef("%lu\r\n", CommandTerminal::Dot()->getRxFrequency());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
+        
         int frequency = 0;
         sscanf(args[1].c_str(), "%d", &frequency);
-        if ((code = _dot->setRxFrequency(frequency)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setRxFrequency(frequency) != mDot::MDOT_OK)
         {
             
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -45,15 +37,18 @@
     {
         int frequency;
         if (sscanf(args[1].c_str(), "%d", &frequency) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
-        if (frequency != 0 && (frequency < int(_dot->getMinFrequency()) || frequency > int(_dot->getMaxFrequency()))) {
-            if (_dot->getFrequencyBand() == mDot::FB_868)
-                setErrorMessage("Invalid timeout, expects (0,863000000-870000000)"); 
+
+        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
-                setErrorMessage("Invalid timeout, expects (0,902000000-928000000)");
+                CommandTerminal::setErrorMessage("Invalid frequency, expects (0,902000000-928000000)");
 
             return false;
         }
@@ -61,6 +56,6 @@
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }