1 files changed, 6 insertions, 22 deletions

diff --git a/src/main.c b/src/main.c
index f1115df..caaf2f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,19 +12,7 @@
 #define PIN_NUM_STATUS 27
 
 int main(int argc, char **argv) {
-  /* char *commandList[] = {"AT",
-                         "ATI",
-                         "AT+QCFG=\"nwscanmode\"",
-                         "AT+QCFG=\"iotopmode\"",
-                         "AT+COPS?",
-                         "AT+CREG?",
-                         "AT+CSQ",
-                         "AT+QLTS=1",
-                         "AT+QNWINFO",
-                         "AT+QCSQ",
-                         "AT+QSPN",
-                         "AT+CCLK?"},
-       *cmdList5GTNCfg[] = {"AT+QCFG=\"servicedomain\",1",
+  /* char *cmdList5GTNCfg[] = {"AT+QCFG=\"servicedomain\",1",
                             "AT+QCFG=\"iotopmode\",1",
                             "AT+QCFG=\"nwscanmode\",3",
                             "AT+QCFG=\"band\",0,8000000,8000000,1",
@@ -79,13 +67,11 @@ int main(int argc, char **argv) {
     return 0;
   }
 
-  else if (0 == strcmp(argv[1], "--mqttTest")) {
-    struct networkData *nD = malloc(sizeof(struct networkData));
+  else if (0 == strcmp(argv[1], "--netinfo-pub")) {
+    networkData *nD = malloc(sizeof(networkData));
 
     initNetworkData(nD);
     gatherData(nD, PATH_TO_SERIAL_PORT);
-    freeNetworkData(nD);
-    free(nD);
 
     if (0 != mqttConn(PATH_TO_SERIAL_PORT, "io.adafruit.com", 8883, "kboz",
                       "aio_lvhz87FJ0rIlidH8g30V5mQ7FK7s")) {
@@ -100,11 +86,7 @@ int main(int argc, char **argv) {
       return 1;
     } */
 
-    if (0 !=
-        mqttPub(
-            PATH_TO_SERIAL_PORT, "kboz/feeds/numdata",
-            "{\"value\": {\"sensor-1\":22.587,\"sensor-2\":13.182},\"lat\": "
-            "38.1123,\"lon\": -91.2325,\"ele\": 112}")) {
+    if (0 != mqttPubNetData(PATH_TO_SERIAL_PORT, *nD)) {
       printf("Error publishing to MQTT server\n");
       return 1;
     }
@@ -114,6 +96,8 @@ int main(int argc, char **argv) {
       return 1;
     }
 
+    freeNetworkData(nD);
+    free(nD);
     return 0;
   }