From 94eb19edc907ec0ef75d93bc6cfc5290f93764a1 Mon Sep 17 00:00:00 2001 From: JongChern Date: Fri, 3 Oct 2025 11:52:28 +0800 Subject: [PATCH 1/3] Update ShimmerDevice.java --- .../main/java/com/shimmerresearch/driver/ShimmerDevice.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index dfdceacb..8c1e157c 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -2107,9 +2107,11 @@ public boolean isSupportedSdLogSync() { } public boolean isHWAndFWSupportedBtBleControl() { - if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM + if((getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4) - && isShimmerGen3()){ + && isShimmerGen3() + || (isShimmerGen3R() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) ))){ return true; } return false; From 676238506f9663a655289f19e9bc1eab7f5b48a1 Mon Sep 17 00:00:00 2001 From: JongChern Date: Tue, 7 Oct 2025 10:58:31 +0800 Subject: [PATCH 2/3] Update ShimmerDevice.java --- .../java/com/shimmerresearch/driver/ShimmerDevice.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 8c1e157c..92c11c8e 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -2107,11 +2107,10 @@ public boolean isSupportedSdLogSync() { } public boolean isHWAndFWSupportedBtBleControl() { - if((getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM - && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4) - && isShimmerGen3() + if((isShimmerGen3() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)) || (isShimmerGen3R() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM - && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) ))){ + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) )){ return true; } return false; From 8039eeb06fdf08c00f2f999fe9bc6ab9968b040d Mon Sep 17 00:00:00 2001 From: jyong15 Date: Tue, 7 Oct 2025 13:53:09 +0800 Subject: [PATCH 3/3] DEV-512 update min supported FW for 3R BT/BLE toggle to v1.0.40 --- .../src/main/java/com/shimmerresearch/driver/ShimmerDevice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java index 92c11c8e..5900af28 100644 --- a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java +++ b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java @@ -2110,7 +2110,7 @@ public boolean isHWAndFWSupportedBtBleControl() { if((isShimmerGen3() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)) || (isShimmerGen3R() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM - && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) )){ + && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 40) )){ return true; } return false;