Merge pull request #249 from ShimmerEngineering/DEV-512

jyong15 · web-flow · commit faa20d3091ec · 2025-10-07T13:57:21.000+08:00
DEV-512_BT_BLE_Control_Support_3R
diff --git a/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java b/ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java
@@ -2107,9 +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, 40) 		)){
 			return true;
 		}
 		return false;

Original file line number	Diff line number	Diff line change
`@@ -2107,9 +2107,10 @@ public boolean isSupportedSdLogSync() {`
`2107`	`2107`	`}`
`2108`	`2108`
`2109`	`2109`	`public boolean isHWAndFWSupportedBtBleControl() {`
`2110`		`- if(getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM`
`2111`		`- && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4)`
`2112`		`- && isShimmerGen3()){`
	`2110`	`+ if((isShimmerGen3() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM`
	`2111`	`+ && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3, FW_ID.LOGANDSTREAM, 1, 0, 4))`
	`2112`	`+ \|\| (isShimmerGen3R() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM`
	`2113`	`+ && mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 40) )){`
`2113`	`2114`	`return true;`
`2114`	`2115`	`}`
`2115`	`2116`	`return false;`