update hw fw compatibility check

Author: MAzalya

ShimmerDriver/src/main/java/com/shimmerresearch/bluetooth/ShimmerBluetooth.java

@@ -1112,7 +1112,7 @@ protected void processInstreamResponse(boolean shouldClearCrcFromBuffer) {
 			}
 			else if(inStreamResponseCommand==STATUS_RESPONSE){
 				int statusBytesToRead = 0;
-				if(getHardwareVersion()==HW_ID.SHIMMER_3R && getFirmwareVersionCode()>=10) {
+				if(isSupportedUSBPluggedInStatus()) {
 					statusBytesToRead = 2;
 				}else {
 					statusBytesToRead = 1;
@@ -2456,6 +2456,10 @@ public boolean isSupportedSdInfoInStatus() {
 		return isThisVerCompatibleWith(FW_ID.LOGANDSTREAM, 0, 7, 12);
 	}
 
+	public boolean isSupportedUSBPluggedInStatus() {
+		return isThisVerCompatibleWith(HW_ID.SHIMMER_3R, FW_ID.LOGANDSTREAM, 1,0, 24);
+	}
+	
 	protected boolean isSupportedInStreamCmds() {
 		if((getFirmwareIdentifier()==FW_ID.LOGANDSTREAM 
 				|| isThisVerCompatibleWith(FW_ID.BTSTREAM, 0, 8, 1))&& getHardwareVersion()!=HW_ID.SHIMMER_2R){

ShimmerDriver/src/main/java/com/shimmerresearch/driverUtilities/ShimmerVerObject.java

@@ -265,9 +265,7 @@ private void parseShimmerVerDetails() {
 				&&mFirmwareVersionInternal!=FW_ID.UNKNOWN){
 			// Handle FW version code.
 			mFirmwareVersionCode = -1;
-			if(UtilShimmer.compareVersions(mHardwareVersion,mFirmwareIdentifier,mFirmwareVersionMajor,mFirmwareVersionMinor,mFirmwareVersionInternal,HW_ID.SHIMMER_3R,FW_ID.LOGANDSTREAM,1,0,24)) {
-				mFirmwareVersionCode = 10;
-			}else if(UtilShimmer.compareVersions(mHardwareVersion,mFirmwareIdentifier,mFirmwareVersionMajor,mFirmwareVersionMinor,mFirmwareVersionInternal,HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,16,6)) {
+			if(UtilShimmer.compareVersions(mHardwareVersion,mFirmwareIdentifier,mFirmwareVersionMajor,mFirmwareVersionMinor,mFirmwareVersionInternal,HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,16,6)) {
 				mFirmwareVersionCode = 9;
 			}else if(UtilShimmer.compareVersions(mHardwareVersion,mFirmwareIdentifier,mFirmwareVersionMajor,mFirmwareVersionMinor,mFirmwareVersionInternal,HW_ID.SHIMMER_3R,FW_ID.LOGANDSTREAM,0,0,1)
 					|| UtilShimmer.compareVersions(mHardwareVersion,mFirmwareIdentifier,mFirmwareVersionMajor,mFirmwareVersionMinor,mFirmwareVersionInternal,HW_ID.SHIMMER_3,FW_ID.LOGANDSTREAM,0,13,7)