Merge pull request #95 from ShimmerEngineering/NOL-48

NOL-48

Author: JongChern

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

@@ -129,7 +129,7 @@ public abstract class ShimmerBluetooth extends ShimmerObject implements Serializ
 	//region --------- CLASS VARIABLES AND ABSTRACT METHODS ---------
 
 	protected long mSetEnabledSensors = SENSOR_ACCEL;								// Only used during the initialization process, see initialize();
-	
+
 	private int mNumberofTXRetriesCount=1;
 	private final static int NUMBER_OF_TX_RETRIES_LIMIT = 0;
 	private class DUMMY_READ_WAIT_TIME_MS {
@@ -249,6 +249,7 @@ public String toString() {
 	transient protected Timer mTimerCheckAlive;
 	transient protected Timer mTimerReadStatus;
 	transient protected Timer mTimerReadBattStatus;								// 
+	transient protected Timer mTimerConnecting;
 	transient protected Timer mTimerCheckSerialPortClear;
 
 	private int mCountDeadConnection = 0;
@@ -1123,6 +1124,7 @@ else if(getHardwareVersion()==HW_ID.SHIMMER_3) {
 			initializeShimmer3();
 		}
 
+		stopTimerConnectingTimeout();
 		startTimerCheckIfAlive();
 	}
 
@@ -2802,6 +2804,7 @@ public void stopAllTimers(){
 		stopTimerCheckAlive();
 		stopTimerCheckForAckOrResp();
 		stopTimerReadBattStatus();
+		stopTimerConnectingTimeout();
 	}
 
 	public void stopTimerCheckForAckOrResp(){
@@ -3105,6 +3108,37 @@ public void restartTimersIfNull() {
         }
 	}
 
+	public void startTimerConnectingTimeout() {
+		mTimerConnecting = new Timer();
+		mTimerConnecting.schedule(new connectingTimeoutTask(), LiteProtocol.TIMER_CONNECTING_TIMEOUT);
+		consolePrintLn("Started connecting timer...");
+	}
+	
+	public void stopTimerConnectingTimeout() {
+		if(mTimerConnecting != null) {
+			consolePrintLn("Stopped connecting timer...");
+			try {
+				mTimerConnecting.cancel();
+				mTimerConnecting.purge();
+			} catch (NullPointerException npe) {
+				npe.printStackTrace();
+			}
+			mTimerConnecting = null;
+		}
+	}
+
+	private class connectingTimeoutTask extends TimerTask {
+		@Override
+	    public void run() {
+        	if(mBluetoothRadioState == BT_STATE.CONNECTING)
+        	{
+            	connectionLost();
+            	stopTimerConnectingTimeout();
+        		consolePrintLn("Connecting timer timed out, connection lost");
+        	}
+	    }
+	}
+	
 	public void stopTimerCheckForSerialPortClear(){
 		//Terminate the timer thread
 		if(mTimerCheckSerialPortClear!=null){
@@ -3146,7 +3180,7 @@ public void run() {
 			connectionLost();
 		}
 	}
-	
+		
 	//endregion --------- TIMERS ---------
 
 

ShimmerDriver/src/main/java/com/shimmerresearch/comms/radioProtocol/LiteProtocol.java

@@ -79,6 +79,7 @@ public class InstructionsGet{
 	public static final int TIMER_READ_STATUS_PERIOD = 5000;
 	public static final int TIMER_READ_BATT_STATUS_PERIOD = 60000; // Batt status is updated every 1min
 	public static final int TIMER_CHECK_ALIVE_PERIOD = 2000;
+	public static final int TIMER_CONNECTING_TIMEOUT = 20000;
 
 	transient protected Timer mTimerCheckForAckOrResp;								// Timer variable used when waiting for an ack or response packet
 	transient protected Timer mTimerCheckAlive;

ShimmerDriverPC/src/main/java/com/shimmerresearch/pcDriver/ShimmerPC.java

@@ -89,7 +89,6 @@
 import jssc.SerialPortException;
 import jssc.SerialPortTimeoutException;
 
-
 public class ShimmerPC extends ShimmerBluetooth implements Serializable{
 
 	/** * */
@@ -350,6 +349,8 @@ public void run(){
 				setBluetoothRadioState(BT_STATE.CONNECTING);
 
 //				mMyBluetoothAddress = address;
+				startTimerConnectingTimeout();
+				
 				setIamAlive(false);
 				getListofInstructions().clear();
 
@@ -416,7 +417,6 @@ public void run(){
 //	    }
 	}
 
-	
 	@Override
 	public boolean bytesAvailableToBeRead() {
 		try {
@@ -616,14 +616,12 @@ private void closeConnection(){
 			mIsInitialised = false;
 
 			setBluetoothRadioState(BT_STATE.DISCONNECTED);
-			if (mSerialPort != null){
-				
+			if (mSerialPort != null) {
 				if (mSerialPort.isOpened()) {
 					mSerialPort.purgePort(1);
 					mSerialPort.purgePort(2);
 					mSerialPort.closePort();
 				}
-				
 			}
 			 mSerialPort = null;
 		} catch (Exception ex) {
@@ -934,4 +932,3 @@ public static void setDefaultCrcMode(BT_CRC_MODE defaultCrcMode) {
 	}
 
 }
-

ShimmerDriverPC/src/main/java/com/shimmerresearch/pcDriver/ShimmerPCBTBCove.java

@@ -595,7 +595,5 @@ public Set<Integer> getSensorIdsSet() {
 		return null;
 	}
 
-	
-	
 }