Merge pull request #421 from bluera1n/develop-pr01

hathach · web-flow · commit 6c52214a400a · 2020-01-17T10:45:35.000+07:00
Fix wrong expression of device ID in getMcuUniqueID()
diff --git a/cores/nRF5/utility/utilities.c b/cores/nRF5/utility/utilities.c
@@ -93,7 +93,7 @@ const char* getMcuUniqueID(void)
   // Skip if already created
   if ( serial_str[0] == 0 )
   {
-    sprintf(serial_str, "%08lu%08lu", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);
+    sprintf(serial_str, "%08lX%08lX", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);
   }
 
   return serial_str;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ const char* getMcuUniqueID(void)`
`93`	`93`	`// Skip if already created`
`94`	`94`	`if ( serial_str[0] == 0 )`
`95`	`95`	`{`
`96`		`- sprintf(serial_str, "%08lu%08lu", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);`
	`96`	`+ sprintf(serial_str, "%08lX%08lX", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`return serial_str;`