From 4ff27f47bba273f223cbca2b12fa82891e6ecf82 Mon Sep 17 00:00:00 2001 From: JongChern Date: Thu, 9 Oct 2025 12:28:34 +0800 Subject: [PATCH 1/9] Update HwDriverShimmerDeviceDetails.java --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 72d89ae0a..4aecd7787 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -154,6 +154,7 @@ public static final class MASS_STORAGE_DEVICE { }; public static final String[] SHIMMER3R_COMPOSITE_DEVICE = new String[] { "SHIMMER COMPOSITE DEVICE" }; + public static final String[] STM32_COMPOSITE_DEVICE = new String[] { "STM32 COMPOSITE DEVICE" }; public static final String[] SHIMMER3R_MSC_DEVICE = new String[] { "SHIMMER MSC DEVICE" }; From 61c5b6cdf394787890d1057c185498f7364b5b75 Mon Sep 17 00:00:00 2001 From: JongChern Date: Thu, 9 Oct 2025 16:25:09 +0800 Subject: [PATCH 2/9] Update HwDriverShimmerDeviceDetails.java --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 4aecd7787..3e2901f26 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -153,8 +153,7 @@ public static final class MASS_STORAGE_DEVICE { "shimmer", }; - public static final String[] SHIMMER3R_COMPOSITE_DEVICE = new String[] { "SHIMMER COMPOSITE DEVICE" }; - public static final String[] STM32_COMPOSITE_DEVICE = new String[] { "STM32 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" }; From 80a34688e5391df1dbb55e6fd53bfde8498cff43 Mon Sep 17 00:00:00 2001 From: JongChern Date: Thu, 9 Oct 2025 18:03:41 +0800 Subject: [PATCH 3/9] Update HwDriverShimmerDeviceDetails.java --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 3e2901f26..8e23dd002 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -155,7 +155,7 @@ public static final class MASS_STORAGE_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 DEVICE","STM32 MSC DEVICE" }; public static final class SERVICE_DESCRIPTION { public static final String[] COMPOSITE_DEVICE = new String[]{"USB Composite Device"}; From d584ff75c9ca56d3a4b1afa33c673110c0696ac3 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Thu, 13 Nov 2025 12:19:03 +0800 Subject: [PATCH 4/9] add verisense usb support --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 8e23dd002..5c4f08201 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -152,6 +152,14 @@ public static final class MASS_STORAGE_DEVICE { 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","STM32 COMPOSITE DEVICE"}; From 6f8a13d66e98f9e5c792ded0da77463ad1250a14 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Thu, 13 Nov 2025 12:49:52 +0800 Subject: [PATCH 5/9] update 3r msc storage device listing --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 5c4f08201..74e175ea1 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java @@ -163,7 +163,7 @@ public static final class MASS_STORAGE_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","STM32 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"}; From 6a0073323493afba9891108bd4106b6469aa3adf Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Mon, 1 Dec 2025 13:43:47 +0800 Subject: [PATCH 6/9] add method to filter 3r usb --- .../driverUtilities/UtilShimmer.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java index c34293add..75dc1f8d2 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java +++ b/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])) { From b74050643b18c478b70199dac90a6a88f388c235 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Tue, 9 Dec 2025 15:30:30 +0800 Subject: [PATCH 7/9] add dfu mode VID/PID --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 74e175ea1..b86a4f0b6 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/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", From 5e9ef938f27133850029f73cf36f8cc30d08e7a3 Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Mon, 15 Dec 2025 14:09:51 +0800 Subject: [PATCH 8/9] rename method, update logic --- .../driverUtilities/UtilShimmer.java | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java index 0b05f4fe0..7709f57f9 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java @@ -793,23 +793,6 @@ 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])) { @@ -818,6 +801,32 @@ public static boolean stringContainsItemFromList(String inputString, String[] it } return false; } + + public static boolean stringContainsOnlyWordsItemFromListUpperCaseCheck(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); From 680ea628b8a928a3c70d47f268c534e3815116da Mon Sep 17 00:00:00 2001 From: Mas Azalya Date: Mon, 15 Dec 2025 14:19:16 +0800 Subject: [PATCH 9/9] rename --- .../java/com/shimmerresearch/driverUtilities/UtilShimmer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java index 7709f57f9..0474b595a 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/UtilShimmer.java @@ -802,7 +802,7 @@ public static boolean stringContainsItemFromList(String inputString, String[] it return false; } - public static boolean stringContainsOnlyWordsItemFromListUpperCaseCheck(String inputString, String[] items) { + public static boolean stringContainsOnlyWordsItemFromList(String inputString, String[] items) { boolean allMatched = true; String target = inputString.toUpperCase();