DEV-574 #time 10m restored some formatting and improved console print

Author: marknolan

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

@@ -1010,8 +1010,10 @@ else if(isSupportedInStreamCmds() && bufferTemp[getPacketSizeWithCrc()+2]==INSTR
 		//TODO: ACK in bufferTemp[0] not handled
 		//else if
 		else {
-			printLogDataForDebugging("Packet syncing problem:\tExpected: " + (getPacketSizeWithCrc()+2) + "bytes. Buffer contains " + mByteArrayOutputStream.size() + "bytes" 
-									+ "\nBuffer = " + UtilShimmer.bytesToHexStringWithSpacesFormatted(mByteArrayOutputStream.toByteArray()));
+			printLogDataForDebugging("Unexpected packet header bytes. Expected size: " + getPacketSizeWithCrc()
+					+ ", Packet 1 header: " + UtilShimmer.byteToHexStringFormatted(bufferTemp[0])
+					+ ", Packet 2 header: " + UtilShimmer.byteToHexStringFormatted(bufferTemp[getPacketSizeWithCrc() + 1]) 
+					+ "\nBuffer: " + UtilShimmer.bytesToHexStringWithSpacesFormatted(mByteArrayOutputStream.toByteArray()));
 			discardBufferBytesToNextPacket(); // Skip to start of next packet
 		}
 	}

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

@@ -156,7 +156,7 @@ public enum OBJECTCLUSTER_TYPE{
 	public int mIndexCal = 0;
 	public int mIndexUncal = 0;
 	public boolean mEnableArraysDataStructure = false;
-
+	
 	public class SensorDataPerType {
 
 		public SensorDataPerType(int length) {

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

@@ -785,7 +785,7 @@ public String toString() {
 	protected boolean mPastGSRFirstTime=true; 	// this is to fix a bug with SDLog v0.9
 
 	// ---------- GSR end ------------------
-
+    
 	public ObjectCluster setLSLTimeIfAvailable(ObjectCluster ojc) {
 		return ojc;
 	}
@@ -923,6 +923,7 @@ public ObjectCluster buildMsg(byte[] newPacket, COMMUNICATION_TYPE fwType, boole
 
 		if (getHardwareVersion()==HW_ID.SHIMMER_SR30 || getHardwareVersion()==HW_ID.SHIMMER_3  || getHardwareVersion()==HW_ID.SHIMMER_3R  
 				|| getHardwareVersion()==HW_ID.SHIMMER_GQ_802154_LR || getHardwareVersion()==HW_ID.SHIMMER_GQ_802154_NR || getHardwareVersion()==HW_ID.SHIMMER_2R_GQ){
+			
 			parseTimestampShimmer3(fwType, objectCluster, uncalibratedData, uncalibratedDataUnits, calibratedData, calibratedDataUnits, sensorNames, newPacketInt);
 
 			//OFFSET