Merge pull request #257 from ShimmerEngineering/DEV-331

DEV-331 USB 3R support - DFU

Author: JongChern

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

@@ -148,6 +148,11 @@ public static final class MASS_STORAGE_DEVICE {
         public static final String[] SHIMMER_3R = new String[] {
     		"VID_0483&PID_52A4",
         };
+        
+        public static final String[] SHIMMER_3R_USB_DFU = new String[] {
+        	"VID_0483&PID_DF11",
+        };
+
 
 		public static final String[] SHIMMER = new String[] {
     		"shimmer",

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

@@ -793,6 +793,23 @@ public static boolean stringContainsItemFromListUpperCaseCheck(String inputStrin
 	    return false;
 	}
 
+	public static boolean stringOnlyContainsItemFromListUpperCaseCheck(String inputString, String[] items) {
+		
+	    for(int i =0; i < items.length; i++) {
+
+	    	String[] words = items[i].toUpperCase().split("\\s+");
+		    String target = inputString.toUpperCase();
+		    
+		    for (String w : words) {
+		        if (!target.contains(w)) {
+		            return false;
+		        }
+		    }   
+		    return true;
+	    }	    
+	    return false;
+	}
+	
 	public static boolean stringContainsItemFromList(String inputString, String[] items) {
 	    for(int i =0; i < items.length; i++) {
 	        if(inputString.contains(items[i])) {