update

Author: MAzalya

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

@@ -1111,7 +1111,13 @@ protected void processInstreamResponse(boolean shouldClearCrcFromBuffer) {
 				}
 			}
 			else if(inStreamResponseCommand==STATUS_RESPONSE){
-				byte[] responseData = readBytes(2, inStreamResponseCommand);
+				int statusBytesToRead = 0;
+				if(getHardwareVersion()==HW_ID.SHIMMER_3R && getFirmwareVersionCode()>=10) {
+					statusBytesToRead = 2;
+				}else {
+					statusBytesToRead = 1;
+				}
+				byte[] responseData = readBytes(statusBytesToRead, inStreamResponseCommand);
 				if(responseData!=null){
 					parseStatusByte(responseData);
 
@@ -2414,10 +2420,6 @@ protected void parseStatusByte(byte[] statusByte){
 		if(isSupportedRedLedStateInStatus()){
 			mIsRedLedOn = ((statusByte[0] & (0x01 << 7)) > 0)? true:false;
 		}
-		
-		if(getHardwareVersion()==HW_ID.SHIMMER_3R && getFirmwareVersionCode()>=10) {
-			setIsUsbPluggedIn(((statusByte[1] & (0x01 << 0)) > 0)? true:false);
-		}
 
 		consolePrintLn("\nStatus Response = \n" + UtilShimmer.byteToHexStringFormatted(statusByte[0]) 
 				+ "\t" + "IsDocked = " + isDocked()
@@ -2429,8 +2431,13 @@ protected void parseStatusByte(byte[] statusByte){
 				+ "\t" + "mIsSdPresent = " + isSDPresent()
 				+ "\t" + "mIsRedLedOn = " + mIsRedLedOn);
 
-		consolePrintLn("\nStatus Response = \n" + UtilShimmer.byteToHexStringFormatted(statusByte[1]) 
-		+ "\t" + "IsUsbPluggedIn = " + isUsbPluggedIn());
+		if(statusByte.length > 1) {
+			setIsUsbPluggedIn(((statusByte[1] & (0x01 << 0)) > 0)? true:false);
+			
+			consolePrintLn("\nStatus Response = \n" + UtilShimmer.byteToHexStringFormatted(statusByte[1]) 
+			+ "\t" + "IsUsbPluggedIn = " + isUsbPluggedIn());
+			
+		}
 
 		if(savedDockedState!=isDocked()){
 			dockedStateChange();

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

@@ -265,7 +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,23)) {
+			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)) {
 				mFirmwareVersionCode = 9;