Skip to content

Commit 6762385

Browse files
committed
Update ShimmerDevice.java
1 parent 94eb19e commit 6762385

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

ShimmerDriver/src/main/java/com/shimmerresearch/driver/ShimmerDevice.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,11 +2107,10 @@ public boolean isSupportedSdLogSync() {
21072107
}
21082108

21092109
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))
21132112
|| (isShimmerGen3R() && getFirmwareIdentifier()==ShimmerVerDetails.FW_ID.LOGANDSTREAM
2114-
&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) ))){
2113+
&& mShimmerVerObject.compareVersions(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1, 0, 39) )){
21152114
return true;
21162115
}
21172116
return false;

0 commit comments

Comments
 (0)