Diff: CommandTerminal/CmdPing.cpp

Revision:

14:f9a77400b622

Parent:

9:ff62b20f7000

--- a/CommandTerminal/CmdPing.cpp	Fri Nov 04 19:10:24 2016 +0000
+++ b/CommandTerminal/CmdPing.cpp	Fri Nov 04 14:25:43 2016 -0500
@@ -1,26 +1,24 @@
 #include "CmdPing.h"
 
-CmdPing::CmdPing(mDot* dot, mts::MTSSerial& serial) : Command(dot, "Send Ping", "AT+PING", "Sends ping and displays the servers received rssi and snr"), _serial(serial)
+CmdPing::CmdPing() : Command("Send Ping", "AT+PING", "Sends ping and displays the servers received rssi and snr", "(-140-0),(-20.0-20.0)")
 {
-    _help = std::string(text()) + ": " + std::string(desc());
-    _usage = "(-140-0),(-20.0-20.0)";
 }
 
 uint32_t CmdPing::action(std::vector<std::string> args)
 {
     mDot::ping_response response;
-    response = _dot->ping();
+    response = CommandTerminal::Dot()->ping();
     if (response.status != mDot::MDOT_OK) {
         std::string error = mDot::getReturnCodeString(response.status);
 
         if (response.status != mDot::MDOT_NOT_JOINED)
-            error +=  + " - " + _dot->getLastError();
+            error +=  + " - " + CommandTerminal::Dot()->getLastError();
 
-        setErrorMessage(_dot->getLastError());;
+        CommandTerminal::setErrorMessage(CommandTerminal::Dot()->getLastError());;
         return 1;
     }
 
-    _serial.writef("%d,%d.%d\r\n", response.rssi, response.snr / 10, abs(response.snr) % 10);
+    CommandTerminal::Serial()->writef("%d,%d.%d\r\n", response.rssi, response.snr / 10, abs(response.snr) % 10);
 
     return 0;
 }