Diff: main.cpp

Revision:

2:e3846f091b6b

Parent:

0:e477c0f8b2e4

Child:

3:e1f6c5af437e

--- a/main.cpp	Mon Nov 27 16:17:37 2017 +0100
+++ b/main.cpp	Fri Dec 01 11:05:04 2017 +0100
@@ -36,7 +36,7 @@
 
 #define ORG_QUICKSTART           // comment to connect to play.internetofthings.ibmcloud.com
 //#define SUBSCRIBE              // uncomment to subscribe to broker msgs (not to be used with IBM broker) 
-//#define X_NUCLEO_NFC01A1_PRESENT // uncomment to add NFC support
+#define X_NUCLEO_NFC01A1_PRESENT // uncomment to add NFC support
     
 #define MQTT_MAX_PACKET_SIZE 400   
 #define MQTT_MAX_PAYLOAD_SIZE 300 
@@ -48,10 +48,10 @@
 #define AUTH_TOKEN ""
 #define DEFAULT_TYPE_NAME "iotsample-mbed-Nucleo"
 #else   // not def ORG_QUICKSTART
-#define ORG "play"             // connect to play.internetofthings.ibmcloud.com/ For a registered connection, replace with your org
-#define ID ""       // For a registered connection, replace with your id
-#define AUTH_TOKEN ""// For a registered connection, replace with your auth-token
-#define DEFAULT_TYPE_NAME "sensor"
+#define ORG MQTT_ORG_ID            // connect to ORG.internetofthings.ibmcloud.com/ For a registered connection, replace with your org
+#define ID MQTT_DEVICE_ID          // For a registered connection is your device id
+#define AUTH_TOKEN  MQTT_DEVICE_PASSWORD  // For a registered connection is a device auth-token
+#define DEFAULT_TYPE_NAME  MQTT_DEVICE_TYPE  // For a registered connection is device type
 #endif
 
 #define TYPE DEFAULT_TYPE_NAME       // For a registered connection, replace with your type
@@ -104,7 +104,7 @@
     // Construct clientId - d:org:type:id
     char clientId[strlen(org) + strlen(type) + strlen(id) + 5];  
     sprintf(clientId, "d:%s:%s:%s", org, type, id);  
-    sprintf(subscription_url, "%s.%s/#/device/%s/sensor/", org, "internetofthings.ibmcloud.com",id);
+    sprintf(subscription_url, "%s.%s/#/device/%s/%s/", org, "internetofthings.ibmcloud.com", id, DEFAULT_TYPE_NAME);
 
     // Network debug statements 
     LOG("=====================================\n\r");
@@ -141,6 +141,7 @@
     {        
         data.username.cstring = "use-token-auth";
         data.password.cstring = auth_token;
+        printf ("AutToken: %s\n\r", auth_token);
     }   
     if ((rc = client->connect(data)) != 0) {
         printf("rc from MQTT connect is %d\r\n", rc);