Diff: main.cpp

Revision:

2:d4dcf1ebaa99

Parent:

1:5a896191c3c4

Child:

3:0a48c984e15b

--- a/main.cpp	Fri May 12 11:49:58 2017 +0000
+++ b/main.cpp	Fri May 19 12:42:57 2017 +0000
@@ -1,6 +1,7 @@
 #include "MTSCellularManager.hpp"
 #include "TlsMQTTClient.hpp"
 #include "Certificates.h"
+#include "config.hpp"
 #include <mbed.h>
 #include <mtsas.h>
 #include <ssl.h>
@@ -82,15 +83,10 @@
     logInfo("Connecting MQTT Client");
     TlsMQTTClient client = TlsMQTTClient();
     MQTTPacket_connectData data = MQTTPacket_connectData_initializer;
-    // Account: AC79339963a99f476e6f0b3214abd48a9d
-    // Fleet: FL1a84e19cd6014020b7a26a6f89521d4f
-    // Deployment: DL1daae5d60c5941aea5cd8cf2b693e990
-    //    Sync List: https://preview.twilio.com/Sync/Services/IS1a84e19cd6014020b7a26a6f89521d4f/Lists/
-    // Device: TH6008344511ed4286b249c3d21891b5ae
-    data.clientID.cstring = "dragonfly-mqtt";
-    data.username.cstring = "KY977b46cdd67645b494da001ced07e40f";
-    data.password.cstring = "RteF2I/fwCjmmdIOoe32qw";
-    if (MQTT::SUCCESS == client.connect("mqtt-sync.us1.twilio.com", 8883, NULL /*MQTT_GATEWAY_PROD_ROOT_CA_PEM*/, data)) {
+    data.clientID.cstring = VEHICLE_ID;
+    data.username.cstring = VEHICLE_KEY;
+    data.password.cstring = VEHICLE_SECRET;
+    if (MQTT::SUCCESS == client.connect(MQTT_GATEWAY_HOST, MQTT_GATEWAY_PORT, NULL /*MQTT_GATEWAY_PROD_ROOT_CA_PEM*/, data)) {
         MQTT::Message message;
         char buf[512];
 
@@ -116,7 +112,7 @@
         message.payload = (void*)buf;
         message.payloadlen = strlen(buf) + 1;
         logInfo("MQTT message publishing buf: %s", buf);
-        int rc = client.publish("sync/lists/vehicle0-data", message);
+        int rc = client.publish("sync/lists/vehicle-" VEHICLE_ID "-data", message);
         logInfo("MQTT message publish result: %d", rc);
 
         logInfo("MQTT disconnecting");