Merge branch 'master' into PR_ADD_IOTV15

Author: mark-edgeworth

src/mbed_os_tools/detect/platform_database.py

@@ -240,6 +240,7 @@
         u"1308": u"NUMAKER_IOT_M487",
         u"1309": u"NUMAKER_M252KG",
         u"1310": u"NUMAKER_IOT_M263A",
+        u"1312": u"NU_M2354",
         u"1500": u"RHOMBIO_L476DMW1K",
         u"1549": u"LPC1549",
         u"1600": u"LPC4330_M4",

src/mbed_os_tools/detect/windows.py

@@ -70,8 +70,8 @@ def _is_mbed_volume(volume_string):
 
 def _get_cached_mounted_points():
     """! Get the volumes present on the system
-    @return List of mount points and their associated target id
-      Ex. [{ 'mount_point': 'D:', 'target_id_usb_id': 'xxxx'}, ...]
+    @return List of mount points and their associated volume string
+      Ex. [{ 'mount_point': 'D:', 'volume_string': 'xxxx'}, ...]
     """
     result = []
     try:
@@ -80,7 +80,7 @@ def _get_cached_mounted_points():
             winreg.HKEY_LOCAL_MACHINE, "SYSTEM\\MountedDevices"
         )
         for v in _iter_vals(mounted_devices_key):
-            # Valid entries have the following format: \DosDevices\D:
+            # Valid entries have the following format: \\DosDevices\\D:
             if "DosDevices" not in v[0]:
                 continue