Merge pull request #273 from ShimmerEngineering/DEV-636_usbx_cdc_acm_msc_integration_changes

DEV-636 S3R USBX support

Author: JongChern

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java

@@ -161,10 +161,6 @@ public static final class MASS_STORAGE_DEVICE {
 		    "verisense",
 		};
 
-		public static final String[] SHIMMER3R_COMPOSITE_DEVICE = new String[] { "SHIMMER COMPOSITE DEVICE","STM32 COMPOSITE DEVICE"};
-
-		public static final String[] SHIMMER3R_MSC_DEVICE = new String[] { "SHIMMER MSC","STM32 MSC DEVICE" };
-
 		public static final String[] SHIMMER3R_DFU_DEVICE_BUS_DESCRITION = new String[] { "DFU in HS Mode" };
 
 		public static final class SERVICE_DESCRIPTION {
@@ -202,7 +198,7 @@ public static final class SERIAL_PORT {
 	        public static final String VIRTUAL_PORT = "COM0COM";
 
 	        public static final String[] SHIMMER_3R = new String[] {
-	        		"VID_0483&PID_52A4"
+	        		"VID_0483&PID_5710" // USBX drivers
 	        };
         }