Resolved merge conflict

Author: Marcelo Salazar

src/mbed_os_tools/detect/platform_database.py

@@ -168,6 +168,7 @@
         u"0839": u"NUCLEO_WB55RG",
         u"0840": u"B96B_F446VE",
         u"0841": u"NUCLEO_G474RE",
+        u"0843": u"NUCLEO_H745ZI_Q",
         u"0847": u"DISCO_H745I",
         u"0849": u"NUCLEO_G070RB",
         u"0850": u"NUCLEO_G431RB",
@@ -223,8 +224,9 @@
         u"1306": u"NUMAKER_PFM_NANO130",
         u"1307": u"NUMAKER_PFM_NUC240",
         u"1308": u"NUMAKER_IOT_M487",
-        u"1309": u"NUMAKER_M252KG",
+        u"1309": u"NUMAKER_IOT_M252",
         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",
@@ -276,6 +278,7 @@
         u"3105": u"SDT64B",
         u"3701": u"S5JS100",
         u"3702": u"S3JT100",
+        u"3703": u"S1SBP6A",
         u"4000": u"LPC11U35_Y5_MBUG",
         u"4005": u"NRF51822_Y5_MBUG",
         u"4100": u"MOTE_L152RC",

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