Diff: CommandTerminal/CmdDeviceClass.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdDeviceClass.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdDeviceClass.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,13 +1,11 @@
 #include "CmdDeviceClass.h"
 #include "CommandTerminal.h"
 
-CmdDeviceClass::CmdDeviceClass(mDot* dot, mts::MTSSerial& serial)
+CmdDeviceClass::CmdDeviceClass()
 :
-  Command(dot, "Device Class", "AT+DC", "Device class (A,B,C)"),
-  _serial(serial) {
-    _help = std::string(text()) + ": " + std::string(desc());
+  Command("Device Class", "AT+DC", "Device class (A,B,C)", "(A,B,C)") {
+
     _queryable = true;
-    _usage = "(A,B,C)";
 }
 
 CmdDeviceClass::~CmdDeviceClass() {
@@ -17,14 +15,10 @@
 uint32_t CmdDeviceClass::action(std::vector<std::string> args) {
 
     if (args.size() == 1) {
-        if (_dot->getVerbose())
-            _serial.writef("Device Class:\r\n");
-        _serial.writef("%s\r\n", _dot->getClass().c_str());
+        CommandTerminal::Serial()->writef("%s\r\n", CommandTerminal::Dot()->getClass().c_str());
     } else {
-        int32_t code;
-        if ((code = _dot->setClass(args[1])) != mDot::MDOT_OK) {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setClass(args[1]) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -44,6 +38,6 @@
         }
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }