Diff: CommandTerminal/CmdFrequencySubBand.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdFrequencySubBand.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdFrequencySubBand.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdFrequencySubBand.h"
 
-CmdFrequencySubBand::CmdFrequencySubBand(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Frequency Sub-band", "AT+FSB", "Set the frequency sub-band for US 915, (0:ALL, 1-8)"), _serial(serial)
+CmdFrequencySubBand::CmdFrequencySubBand() :
+        Command("Frequency Sub-band", "AT+FSB", "Set the frequency sub-band for US915 and AU915, (0:ALL, 1-8)", "(0-8)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0-8)";
     _queryable = true;
 }
 
@@ -13,20 +11,15 @@
 
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Frequency Sub Band: ");
-
-        _serial.writef("%u\r\n", _dot->getFrequencySubBand());
+        CommandTerminal::Serial()->writef("%u\r\n", CommandTerminal::Dot()->getFrequencySubBand());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         uint32_t band;
         sscanf(args[1].c_str(), "%lu", &band);
 
-        if ((code = _dot->setFrequencySubBand(band)) != mDot::MDOT_OK) {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setFrequencySubBand(band) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -43,18 +36,18 @@
     {
         int band;
         if (sscanf(args[1].c_str(), "%d", &band) != 1) {
-            setErrorMessage("Invalid arguments");
+            CommandTerminal::setErrorMessage("Invalid arguments");
             return false;
         }
 
         if (band < mDot::FSB_ALL || band > mDot::FSB_8) {
-            setErrorMessage("Invalid channel band, expects (0-8)");
+            CommandTerminal::setErrorMessage("Invalid channel band, expects (0-8)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }