1 files changed, 12 insertions, 59 deletions

diff --git a/CommandTerminal/CmdDisplayConfig.cpp b/CommandTerminal/CmdDisplayConfig.cpp
index 6ef6e92..2f11218 100644
--- a/CommandTerminal/CmdDisplayConfig.cpp
+++ b/CommandTerminal/CmdDisplayConfig.cpp
@@ -1,4 +1,7 @@
 #include "CmdDisplayConfig.h"
+#include "version.h"
+
+std::string version = MTDOT_BOX_VERSION;
 
 CmdDisplayConfig::CmdDisplayConfig(mDot* dot, mts::MTSSerial& serial)
 :
@@ -9,6 +12,9 @@ CmdDisplayConfig::CmdDisplayConfig(mDot* dot, mts::MTSSerial& serial)
 }
 
 uint32_t CmdDisplayConfig::action(std::vector<std::string> args) {
+    _serial.writef("Firmware: \t\t%s\r\n", version.c_str());
+    _serial.writef("Library : \t\t%s\r\n", _dot->getId().c_str());
+	
     _serial.writef("Device ID:\t\t");
     _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getDeviceId(), ":").c_str());
 
@@ -16,7 +22,6 @@ uint32_t CmdDisplayConfig::action(std::vector<std::string> args) {
     _serial.writef("Frequency Sub Band:\t%u\r\n", _dot->getFrequencySubBand());
 
     _serial.writef("Public Network:\t\t%s\r\n", _dot->getPublicNetwork() ? "on" : "off");
-    _serial.writef("Start Up Mode:\t\t%s\r\n", mDot::ModeStr(_dot->getStartUpMode()).c_str());
 
     _serial.writef("Network Address:\t%s\r\n", mts::Text::bin2hexString(_dot->getNetworkAddress()).c_str());
 
@@ -38,68 +43,16 @@ uint32_t CmdDisplayConfig::action(std::vector<std::string> args) {
 
     _serial.writef("Network Join Mode:\t%s\r\n", mDot::JoinModeStr(_dot->getJoinMode()).c_str());
 
-    _serial.writef("Network Join Retries:\t%u\r\n", _dot->getJoinRetries());
-
-    _serial.writef("Join Byte Order:\t%s\r\n", _dot->getJoinByteOrder() ? "MSB" : "LSB");
-
-    _serial.writef("Link Check Threshold:\t");
-    if (_dot->getLinkCheckThreshold() == 0) {
-        _serial.writef("off\r\n");
-    } else {
-        _serial.writef("%lu\r\n", _dot->getLinkCheckThreshold());
-    }
-
-    _serial.writef("Link Check Count:\t");
-    if (_dot->getLinkCheckCount() == 0) {
-        _serial.writef("off\r\n");
-    } else {
-        _serial.writef("%lu packets\r\n", _dot->getLinkCheckCount());
-    }
-
-    _serial.writef("Error Correction:\t");
-    if (_dot->getFec() == 0) {
-        _serial.writef("off\r\n");
-    } else {
-        _serial.writef("%u bytes\r\n", _dot->getFec());
-    }
-
-    _serial.writef("ACK Retries:\t\t");
-    if (_dot->getAck() == 0) {
-        _serial.writef("off\r\n");
-    } else {
-        _serial.writef("%u\r\n", _dot->getAck());
-    }
-
-    _serial.writef("Encryption:\t\t%s\r\n", _dot->getAesEncryption() ? "on" : "off");
-    _serial.writef("CRC:\t\t\t%s\r\n", _dot->getCrc() ? "on" : "off");
-    _serial.writef("Adaptive Data Rate:\t%s\r\n", _dot->getAdr() ? "on" : "off");
-    _serial.writef("Command Echo:\t\t%s\r\n", _dot->getEcho() ? "on" : "off");
-    _serial.writef("Verbose Response:\t%s\r\n", _dot->getVerbose() ? "on" : "off");
-
-    _serial.writef("Tx Frequency:\t\t%lu\r\n", _dot->getTxFrequency());
     _serial.writef("Tx Data Rate:\t\t%s\r\n", mDot::DataRateStr(_dot->getTxDataRate()).c_str());
     _serial.writef("Tx Power:\t\t%u\r\n", _dot->getTxPower());
-    _serial.writef("Tx Wait:\t\t%s\r\n", _dot->getTxWait() ? "on" : "off");
-
-    _serial.writef("Tx Inverted Signal:\t%s\r\n", _dot->getTxInverted() ? "on" : "off");
-
-    _serial.writef("Rx Frequency:\t\t%lu\r\n", _dot->getRxFrequency());
-    _serial.writef("Rx Data Rate:\t\t%s\r\n", mDot::DataRateStr(_dot->getRxDataRate()).c_str());
-    _serial.writef("Rx Inverted Signal:\t%s\r\n", _dot->getRxInverted() ? "on" : "off");
-
-    _serial.writef("Rx Output Style:\t%s\r\n", mDot::RxOutputStr(_dot->getRxOutput()).c_str());
-
-    _serial.writef("Debug Baud Rate:\t%lu\r\n", _dot->getDebugBaud());
-    _serial.writef("Serial Baud Rate:\t%lu\r\n", _dot->getBaud());
-
-    _serial.writef("Wake Mode:\t\t%s\r\n", _dot->getWakeMode() == 0 ? "INTERVAL" : "INTERRUPT");
-    _serial.writef("Wake Interval:\t\t%lu s\r\n", _dot->getWakeInterval());
-    _serial.writef("Wake Delay:\t\t%lu ms\r\n", _dot->getWakeDelay());
-    _serial.writef("Wake Timeout:\t\t%u ms\r\n", _dot->getWakeTimeout());
+    _serial.writef("Log Level:\t\t%ld\r\n", _dot->getLogLevel());
 
-    //_serial.writef("Wake Pin:\t\t%s\r\n", mDot::pinName2Str(_dot->getWakePin()).c_str());
+    _serial.writef("Maximum Size:\t\t%u\r\n",	_dot->getWakeDelay());		//DotBox +MaxSize is stored here.
+    _serial.writef("Minimum Size:\t\t%u\r\n",	_dot->getWakeInterval());	//DotBox +MinSize is stored here.
+    _serial.writef("Maximum Power:\t\t%u\r\n",	_dot->getWakeMode());		//DotBox +MaxPwr is stored here.
+    _serial.writef("Minimum Power:\t\t%u\r\n",	_dot->getWakeTimeout());	//DotBox +MinPwr is stored here.
+    _serial.writef("Data:\t\t\t%d\r\n",	_dot->getStartUpMode());			//DotBox +Data is stored here.
 
-    _serial.writef("Log Level:\t\t%ld\r\n", _dot->getLogLevel());
 
     return 0;
 }