DEV-331 #time 10m ability to show when Shimmer has stopped wired comms

Author: marknolan

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

@@ -147,7 +147,8 @@ public abstract class ShimmerDevice extends BasicProcessWithCallBack implements
 	protected boolean mIsStreaming = false;											// This is used to monitor whether the device is in streaming mode
 	protected boolean mIsInitialised = false;
 	private boolean mIsDocked = false;
-	private boolean mIsUsbPluggedIn= false;
+	private boolean mIsUsbPluggedIn = false;
+	private boolean mIsDockCommsSuccessful = false;
 	public boolean mIsUsbDfuMode= false;
 	protected boolean mHaveAttemptedToReadConfig = false;
 
@@ -4787,4 +4788,12 @@ public String getRadioModel() {
 		return "";
 	}
 
+	public boolean isDockCommsSuccessful() {
+		return mIsDockCommsSuccessful;
+	}
+	
+	public void setDockCommsSuccessful(boolean isDockCommsSuccessful) {
+		mIsDockCommsSuccessful = isDockCommsSuccessful;
+	}
+
 }

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

@@ -26,6 +26,8 @@ public class ShimmerShell extends ShimmerDevice {
 	/** * */
 	private static final long serialVersionUID = 3505947289367382624L;
 
+	public String macIDParsed = "";
+	
 	public ShimmerShell() {
 		setFirstDockRead();
 	}
@@ -147,5 +149,23 @@ protected void dataHandler(ObjectCluster ojc) {
 		// TODO Auto-generated method stub
 
 	}
+	
+	@Override
+	public String getMacIdFromUartParsed() {
+		if(!macIDParsed.isEmpty()) {
+			return macIDParsed;
+		} else {
+			return super.getMacIdFromUartParsed();
+		}
+	}
+	
+	@Override
+	public String getMacIdParsed() {
+		if(!macIDParsed.isEmpty()) {
+			return macIDParsed;
+		} else {
+			return super.getMacIdParsed();
+		}
+	}
 
 }