Diff: CommandTerminal/CmdSerialBaudRate.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdSerialBaudRate.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdSerialBaudRate.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,12 @@
 #include "CmdSerialBaudRate.h"
 
-CmdSerialBaudRate::CmdSerialBaudRate(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Serial Baud Rate", "AT+IPR", "Set serial baud rate, default: 115200 "), _serial(serial)
+CmdSerialBaudRate::CmdSerialBaudRate() :
+#if defined(TARGET_MTS_MDOT_F411RE)
+        Command("Serial Baud Rate", "AT+IPR", "Set serial baud rate, default: 115200 ", "(1200,2400,4800,9600,19200,38400,57600,115200,230400,460800,921600)")
+#else
+        Command("Serial Baud Rate", "AT+IPR", "Set serial baud rate, default: 115200 ", "(1200,2400,4800,9600,19200,38400,57600,115200,230400)")
+#endif
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(1200,2400,4800,9600,19200,38400,57600,115200,230400,460800,921600)";
     _queryable = true;
 }
 
@@ -12,23 +14,20 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Serial Baud Rate: ");
-
-        _serial.writef("%lu\r\n", _dot->getBaud());
+        CommandTerminal::Serial()->writef("%lu\r\n", CommandTerminal::Dot()->getBaud());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
+        
         int baudrate = 0;
 
         sscanf(args[1].c_str(), "%d", &baudrate);
 
-        if ((code = _dot->setBaud(baudrate)) == mDot::MDOT_OK) {
-            _serial.writef("Set Serial Baud Rate: %lu\r\n", baudrate);
+        if (CommandTerminal::Dot()->setBaud(baudrate) == mDot::MDOT_OK) {
+            CommandTerminal::Serial()->writef("Set Serial Baud Rate: %lu\r\n", baudrate);
         } else {
             
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -45,13 +44,13 @@
         int baudrate;
 
         if (sscanf(args[1].c_str(), "%d", &baudrate) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }