Diff: CommandTerminal/CmdDisplayConfig.cpp

Revision:

12:05435282f899

Parent:

7:a31236c2e75c

--- a/CommandTerminal/CmdDisplayConfig.cpp	Thu Nov 10 22:10:58 2016 +0000
+++ b/CommandTerminal/CmdDisplayConfig.cpp	Tue Oct 09 13:49:30 2018 -0500
@@ -38,10 +38,22 @@
     _serial.writef("%s\r\n", mts::Text::bin2hexString(_dot->getDeviceId(), ":").c_str());
 
     _serial.writef("Frequency Band:\t\t%s\r\n", mDot::FrequencyBandStr(_dot->getFrequencyBand()).c_str());
-    if (_dot->getFrequencyBand() == mDot::FB_US915)
+    if (lora::ChannelPlan::IsPlanFixed(_dot->getFrequencyBand()))
 	_serial.writef("Frequency Sub Band:\t%u\r\n", _dot->getFrequencySubBand());
 
-    _serial.writef("Public Network:\t\t%s\r\n", _dot->getPublicNetwork() ? "on" : "off");
+    std::string network_mode("Undefined");
+    uint8_t network_type = _dot->getPublicNetwork();
+    if (network_type == lora::PRIVATE_MTS)
+        network_mode = "Private MTS";
+    else if (network_type == lora::PUBLIC_LORAWAN)
+        network_mode = "Public LoRaWAN";
+    else if (network_type == lora::PRIVATE_LORAWAN)
+        network_mode = "Private LoRaWAN";
+    else if (network_type == lora::PEER_TO_PEER)
+        network_mode = "Peer to Peer";
+    _serial.writef("Public Network:\t\t%s\r\n", network_mode.c_str());
+
+    _serial.writef("Join Delay:\t\t%u seconds\r\n", _dot->getJoinDelay());
 
     _serial.writef("Network Address:\t%s\r\n", mts::Text::bin2hexString(_dot->getNetworkAddress()).c_str());
 
@@ -65,8 +77,7 @@
 
     _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("Log Level:\t\t%ld\r\n", _dot->getLogLevel());
-    _serial.writef("Log Level:\t\t%ld\r\n", mts::MTSLog::TRACE_LEVEL);
+    _serial.writef("Log Level:\t\t%u\r\n", _dot->getLogLevel());
 
     _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.