Merge pull request #11 from JerryYangKai/master

change registrationid
MXCHIP · Sep 25, 2019 · d5ba68f · d5ba68f
2 parents d4ffa49 + a91a890
commit d5ba68f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pnp/iotc_devkit/Device/main.ino b/pnp/iotc_devkit/Device/main.ino
@@ -47,7 +47,7 @@ static char *dpsIdScope = NULL;
 // The symmetric key, learn more from https://docs.microsoft.com/en-us/azure/iot-dps/concepts-symmetric-key-attestation.
 static char *sasKey = NULL;
 // The Registration ID, learn more from https://docs.microsoft.com/en-us/azure/iot-dps/use-hsm-with-sdk.
-static char *registrationId = NULL;
+static char *deviceId = NULL;
 
 // TODO: Fill in DIGITALTWIN_DEVICE_CAPABILITY_MODEL_INLINE_DATA if want to make deivce self-describing.
 #define DIGITALTWIN_DEVICE_CAPABILITY_MODEL_INLINE_DATA "{}"
@@ -95,7 +95,7 @@ static bool parseDPSConnectionString(const char *connection_string)
     const char *_globalDpsEndpoint = Map_GetValueFromKey(connection_string_values_map, IOTHUBDPS_ENDPOINT);
     const char *_dpsIdScope = Map_GetValueFromKey(connection_string_values_map, IOTHUBDPS_IDSCOPE);
     const char *_sasKey = Map_GetValueFromKey(connection_string_values_map, IOTHUBDPS_SYMMETRICKEY);
-    const char *_registrationId = Map_GetValueFromKey(connection_string_values_map, IOTHUBDPS_DEVICEID);
+    const char *_deviceId = Map_GetValueFromKey(connection_string_values_map, IOTHUBDPS_DEVICEID);
     if (_globalDpsEndpoint)
     {
         mallocAndStrcpy_s(&globalDpsEndpoint, _globalDpsEndpoint);
@@ -120,17 +120,17 @@ static bool parseDPSConnectionString(const char *connection_string)
     {
         LogError("Couldn't find %s in connection string", IOTHUBDPS_SYMMETRICKEY);
     }
-    if (_registrationId)
+    if (_deviceId)
     {
-        mallocAndStrcpy_s(&registrationId, _registrationId);
+        mallocAndStrcpy_s(&deviceId, _deviceId);
     }
     else
     {
         LogError("Couldn't find %s in connection string", IOTHUBDPS_DEVICEID);
     }  
     Map_Destroy(connection_string_values_map);
 
-    if (globalDpsEndpoint == NULL || dpsIdScope == NULL || sasKey == NULL || registrationId == NULL)
+    if (globalDpsEndpoint == NULL || dpsIdScope == NULL || sasKey == NULL || deviceId == NULL)
     {
         return false;
     }
@@ -176,7 +176,7 @@ static bool registerDevice(bool traceOn)
         return false;
     }
 
-    if (prov_dev_set_symmetric_key_info(registrationId, sasKey) != 0)
+    if (prov_dev_set_symmetric_key_info(deviceId, sasKey) != 0)
     {
         LogError("prov_dev_set_symmetric_key_info failed.");
     }