Diff: CommandTerminal/CmdCRC.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdCRC.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdCRC.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,30 +1,21 @@
 #include "CmdCRC.h"
 
-CmdCRC::CmdCRC(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "CRC Checking ", "AT+CRC", "Enable/disable CRC (0: off, 1: on)"), _serial(serial)
+CmdCRC::CmdCRC()
+:
+  Command("CRC Checking", "AT+CRC", "Enable/disable CRC (0: off, 1: on)", "(0,1)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0,1)";
     _queryable = true;
 }
 
 uint32_t CmdCRC::action(std::vector<std::string> args)
-{
-    if (args.size() == 1)
-    {
-        if (_dot->getVerbose())
-            _serial.writef("CRC Check: ");
-
-        _serial.writef("%d\r\n", _dot->getCrc());
+                        {
+    if (args.size() == 1) {
+        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getCrc());
     }
-    else if (args.size() == 2)
-    {
-        int32_t code;
+    else if (args.size() == 2) {
         bool enable = (args[1] == "1");
-        if ((code = _dot->setCrc(enable)) != mDot::MDOT_OK)
-        {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setCrc(enable) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());
             return 1;
         }
     }
@@ -33,20 +24,19 @@
 }
 
 bool CmdCRC::verify(std::vector<std::string> args)
-{
+                    {
     if (args.size() == 1)
         return true;
 
-    if (args.size() == 2)
-    {
+    if (args.size() == 2) {
         if (args[1] != "1" && args[1] != "0") {
-            setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
+            CommandTerminal::setErrorMessage("Invalid parameter, expects (0: off, 1: on)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }