Diff: CommandTerminal/CmdJoinByteOrder.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdJoinByteOrder.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdJoinByteOrder.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,10 +1,8 @@
 #include "CmdJoinByteOrder.h"
 
-CmdJoinByteOrder::CmdJoinByteOrder(mDot* dot, mts::MTSSerial& serial) :
-        Command(dot, "Join Byte Order", "AT+JBO", "Send EUI's in join request with configured byte ordering (0:LSB,1:MSB)"), _serial(serial)
+CmdJoinByteOrder::CmdJoinByteOrder() :
+        Command("Join Byte Order", "AT+JBO", "Send EUI's in join request with configured byte ordering (0:LSB,1:MSB)", "(0:LSB,1:MSB)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(0:LSB,1:MSB)";
     _queryable = true;
 }
 
@@ -12,23 +10,18 @@
 {
     if (args.size() == 1)
     {
-        if (_dot->getVerbose())
-            _serial.writef("Join Byte Order: ");
-
-        _serial.writef("%d\r\n", _dot->getJoinByteOrder());
+        CommandTerminal::Serial()->writef("%d\r\n", CommandTerminal::Dot()->getJoinByteOrder());
     }
     else if (args.size() == 2)
     {
-        int32_t code;
         mDot::JoinByteOrder order = mDot::LSB;
 
         if (args[1] == "1")
             order = mDot::MSB;
 
-        if ((code = _dot->setJoinByteOrder(order)) != mDot::MDOT_OK)
+        if (CommandTerminal::Dot()->setJoinByteOrder(order) != mDot::MDOT_OK)
         {
-            
-            setErrorMessage(_dot->getLastError());;
+            CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
             return 1;
         }
     }
@@ -44,13 +37,13 @@
     if (args.size() == 2)
     {
         if (args[1] != "0" && args[1] != "1") {
-            setErrorMessage("Invalid argument");
+            CommandTerminal::setErrorMessage("Invalid argument");
             return false;
         }
 
         return true;
     }
 
-    setErrorMessage("Invalid arguments");
+    CommandTerminal::setErrorMessage("Invalid arguments");
     return false;
 }