diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 72d89ae0a..b86a4f0b6 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -148,14 +148,27 @@ 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", }; + + public static final String[] VERISENSE_USB = new String[] { + "VID_1915&PID_520F", + }; + + public static final String[] VERISENSE = new String[] { + "verisense", + }; - public static final String[] SHIMMER3R_COMPOSITE_DEVICE = new String[] { "SHIMMER COMPOSITE DEVICE" }; + 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 DEVICE" }; + public static final String[] SHIMMER3R_MSC_DEVICE = new String[] { "SHIMMER MSC","STM32 MSC DEVICE" }; public static final class SERVICE_DESCRIPTION { public static final String[] COMPOSITE_DEVICE = new String[]{"USB Composite Device"}; diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java index 024b1ba44..0474b595a 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java @@ -801,6 +801,32 @@ public static boolean stringContainsItemFromList(String inputString, String[] it } return false; } + + public static boolean stringContainsOnlyWordsItemFromList(String inputString, String[] items) { + + boolean allMatched = true; + String target = inputString.toUpperCase(); + + for (String item : items) { + + String[] words = item.toUpperCase().split("\\s+"); + + System.out.println("target : " + target); + for (String w : words) { + System.out.println("words = " + w); + + if (!target.contains(w)) { + allMatched = false; + } + } + + if(allMatched) { + return true; + } + } + + return false; + } public void threadSleep(long millis) { millisecondDelay(millis);