JA-108

ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java

@@ -137,6 +137,9 @@ public void connectShimmerThroughBTAddress(BluetoothDeviceDetails deviceDetails)
 		connectThread.start();
 	}
 
+	/**
+	 * @param connectionHandle comport or mac address, note that this does not remove the device from the map
+	 */
 	public void disconnectShimmer(String connectionHandle){
 		printMessage("Attempting to disconnect from connection handle = " + connectionHandle);
 		ShimmerDevice shimmerDevice = getShimmerDeviceBtConnected(connectionHandle); 

ShimmerDriverPC/build.gradle

@@ -90,4 +90,5 @@ dependencies {
     // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add
     // 'test.useTestNG()' to your build script.
     testCompile 'junit:junit:4.12'
+    compile 'com.parse.bolts:bolts-tasks:1.4.0'
 }

ShimmerDriverPC/src/main/java/com/shimmerresearch/guiUtilities/configuration/EnableSensorsDialog.java

@@ -88,6 +88,7 @@ public void actionPerformed(ActionEvent e) {
 
 	@Override
 	protected void createFrame() {
+		 dialog = new JDialog();
 		 dialog.setModal(true);
 		 dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 		 dialog.setTitle("Enable Sensors");

ShimmerDriverPC/src/main/java/com/shimmerresearch/tools/bluetooth/BasicShimmerBluetoothManagerPc.java

@@ -146,7 +146,7 @@ protected Shimmer4sdk createNewShimmer4(ShimmerRadioInitializer radioInitializer
     }
 
 	@Override
-	protected void connectVerisenseDevice(BluetoothDeviceDetails bdd) {
+	public void connectVerisenseDevice(BluetoothDeviceDetails bdd) {
 		VerisenseDevice verisenseDevice;
 
 		if(!verisenseMacIdList.contains(bdd.mShimmerMacId)) {
@@ -178,7 +178,7 @@ protected void connectVerisenseDevice(BluetoothDeviceDetails bdd) {
 	}
 
 	@Override
-	protected void connectShimmer3BleGrpc(BluetoothDeviceDetails bdd) {
+	public void connectShimmer3BleGrpc(BluetoothDeviceDetails bdd) {
 		ShimmerGRPC shimmer;
 
 		if(!shimmer3BleMacIdList.contains(bdd.mShimmerMacId)) {
@@ -207,6 +207,12 @@ protected void connectShimmer3BleGrpc(BluetoothDeviceDetails bdd) {
 	@Override
 	public void connectShimmerThroughCommPort(String comPort){
 		directConnectUnknownShimmer=true;
+
+		if (mMapOfBtConnectedShimmers.containsKey(comPort)){
+			if(!mMapOfBtConnectedShimmers.get(comPort).isConnected()) {
+				mMapOfBtConnectedShimmers.remove(comPort);
+			} 
+		}
 
 		super.setConnectionExceptionListener(new ConnectionExceptionListener() {
 
@@ -243,6 +249,7 @@ public void putShimmerGlobalMap(String bluetoothAddress, ShimmerDevice shimmerDe
 
 	protected void setupShimmer3BluetoothForBtManager(ShimmerDevice shimmerDevice) {
 		((ShimmerPC)shimmerDevice).setUseInfoMemConfigMethod(USE_INFOMEM_CONFIG_METHOD);
+    	((ShimmerPC)shimmerDevice).enableCheckifAlive(true);
 	}