Diff: CommandTerminal/CmdWakeMode.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdWakeMode.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdWakeMode.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,11 +1,12 @@
 #include "CmdWakeMode.h"
 
-CmdWakeMode::CmdWakeMode(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Wake Mode", "AT+WM", "Wakeup mode, INTERRUPT uses DIO7 as wake-up pin (0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)"),
-        _serial(serial)
+CmdWakeMode::CmdWakeMode() :
+#if defined(TARGET_MTS_MDOT_F411RE)
+ Command("Wake Mode", "AT+WM", "Wakeup mode, INTERRUPT uses DIO7 as wake-up pin (0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)", "(0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)")
+#else
+ Command("Wake Mode", "AT+WM", "Wakeup mode, INTERRUPT uses WAKE as wake-up pin (0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)", "(0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)")
+#endif /* TARGET_MTS_MDOT_F411RE */
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)";
     _queryable = true;
 }
 
@@ -13,20 +14,15 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("%s: ", name());
-
-        _serial.writef("%lu\r\n", _dot->getWakeMode());
+        CommandTerminal::Serial()->writef("%lu\r\n", CommandTerminal::Dot()->getWakeMode());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         int mode;
         sscanf(args[1].c_str(), "%d", &mode);
 
-        if ((code = _dot->setWakeMode(mode)) != mDot::MDOT_OK) {
-            
-            setErrorMessage(_dot->getLastError());;
+        if (CommandTerminal::Dot()->setWakeMode(mode) != mDot::MDOT_OK) {
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -42,18 +38,18 @@
     if (args.size() == 2) {
         int mode;
         if (sscanf(args[1].c_str(), "%d", &mode) != 1) {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
         if (mode != 0 && mode != 1 && mode != 2) {
-            setErrorMessage("Invalid mode, expects (0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)");
+            CommandTerminal::setErrorMessage("Invalid mode, expects (0:INTERVAL,1:INTERRUPT,2:INTERVAL_OR_INTERRUPT)");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }