Diff: src/CommandParser/cmd.cpp

Revision:

77:43e0a3d9e536

Parent:

74:03ccf04998b5

Child:

81:d45bfa16953a

--- a/src/CommandParser/cmd.cpp	Mon Sep 19 14:46:03 2016 +0000
+++ b/src/CommandParser/cmd.cpp	Mon Sep 19 21:03:14 2016 +0000
@@ -549,7 +549,7 @@
 {
     UNUSED(argc);
     UNUSED(argv);
-
+    
     mDot::mdot_stats stats = GLOBAL_mdot->getStats();
 
     printf("\r                        Up: %u\n", stats.Up);
@@ -566,9 +566,13 @@
     printf("\r   Application device port: %u\n", GLOBAL_mdot->getAppPort());
     printf("\r                     Class: %s\n", GLOBAL_mdot->getClass().c_str());
     printf("\r         Max packet length: %u\n", GLOBAL_mdot->getMaxPacketLength());
-    // TODO: network address
+    std::vector<uint8_t> na = GLOBAL_mdot->getNetworkAddress();
+    std::string str(na.begin(), na.end());
+    printf("\r           Network address: %s\n", str.c_str());
     printf("\r              Network name: %s\n", GLOBAL_mdot->getNetworkName().c_str());
-    // TODO: get network ID
+    std::vector<uint8_t> nid = GLOBAL_mdot->getNetworkId();
+    std::string networkIdStr(nid.begin(), nid.end());
+    printf("\r                Network ID: %s\n", networkIdStr.c_str());
     printf("\r          Join byter order: %s\n", GLOBAL_mdot->getJoinByteOrder() == 0 ? "LSB" : "MSB");
     printf("\r              Join retries: %u\n", GLOBAL_mdot->getJoinRetries());
     printf("\r                 Join mode: %u\n", GLOBAL_mdot->getJoinMode());
@@ -578,6 +582,7 @@
     printf("\r Packets Rx'd from gateway: %u\n", GLOBAL_mdot->getDownLinkCounter());
     printf("\r            AES encryption: %s\n", GLOBAL_mdot->getAesEncryption() ? "enabled" : "disabled");
     printf("\r              Tx data rate: %u\n", GLOBAL_mdot->getTxDataRate());
+    printf("\r          Datarate Details: %s\n", GLOBAL_mdot->getDateRateDetails(GLOBAL_mdot->getTxDataRate()).c_str());
     printf("\r                  Tx power: %u\n", GLOBAL_mdot->getTxPower());
     printf("\r              Antenna gain: %u\n", GLOBAL_mdot->getAntennaGain());
     printf("\r             Min frequency: %u\n", GLOBAL_mdot->getMinFrequency());