From e303f5c6cf46c242fcb4104e3cf1c9473679936d Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Mon, 16 Mar 2026 17:08:18 +0000 Subject: [PATCH 1/3] DEV-636 #time 1h updated to support S3R USBX --- .../driverUtilities/HwDriverShimmerDeviceDetails.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java index 1d468073..164b1eed 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/HwDriverShimmerDeviceDetails.java +++ b/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 }; } From 7fadd36b5ad2f6c3ef129762911905aa2fac0fa0 Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Thu, 19 Mar 2026 10:48:29 +0000 Subject: [PATCH 2/3] DEV-636 #time 5m changing default state of DTR when opening COM port --- .../com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java b/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java index 3b5362db..8186f471 100644 --- a/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java +++ b/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java @@ -30,7 +30,7 @@ public class SerialPortCommJssc extends AbstractSerialPortHal implements SerialP public String mComPort = ""; private int mBaudToUse = SerialPort.BAUDRATE_115200; private boolean setRtsOnConnect = true; - private boolean setDtrOnConnect = false; + private boolean setDtrOnConnect = true; private transient ShimmerUartListener mShimmerUartListener; private boolean mIsSerialPortReaderStarted = false; From f2439131da473b95b2fcec4c7038fbabeaac170f Mon Sep 17 00:00:00 2001 From: Mark Nolan Date: Sun, 22 Mar 2026 23:44:35 +0000 Subject: [PATCH 3/3] DEV-606 #time 1m Reverting Serial Port DTR change from previous commit --- .../com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java b/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java index 8186f471..3b5362db 100644 --- a/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java +++ b/ShimmerDriverPC/src/main/java/com/shimmerresearch/pcSerialPort/SerialPortCommJssc.java @@ -30,7 +30,7 @@ public class SerialPortCommJssc extends AbstractSerialPortHal implements SerialP public String mComPort = ""; private int mBaudToUse = SerialPort.BAUDRATE_115200; private boolean setRtsOnConnect = true; - private boolean setDtrOnConnect = true; + private boolean setDtrOnConnect = false; private transient ShimmerUartListener mShimmerUartListener; private boolean mIsSerialPortReaderStarted = false;