Merge pull request #237 from ShimmerEngineering/DEV-405

DEV-405

Author: MAzalya

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

@@ -505,6 +505,7 @@ public int getNumCrcBytes() {
 
 	public static final int MSG_IDENTIFIER_VERISENSE_ERASE_DATA_COMPLETED = 14;
 	public static final int MSG_IDENTIFIER_VERISENSE_WRITE_OPCONFIG_COMPLETED = 15;
+	public static final int MSG_IDENTIFIER_SYNC_COMPLETED = 16;
 
 	//	private boolean mVerboseMode = true;
 	//	private String mParentClassName = "ShimmerPC";

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

@@ -26,7 +26,7 @@ public interface RadioListener {
 	public void isNowStreamingCallback();
 	public void hasStopStreamingCallback();
 	public void isNowStreamLoggedDataCallback();
-	public void hasStopStreamLoggedDataCallback();
+	public void hasStopStreamLoggedDataCallback(String binPath);
 	public void initialiseStreamingCallback();
 
 //	public void eventSyncStates(boolean isDocked, boolean isInitialised, boolean isSdLogging, boolean isSensing, boolean isStreaming, boolean haveAttemptedToRead);

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

@@ -107,6 +107,11 @@ public void newSyncPayloadReceived(int payloadIndex, boolean crcError, double tr
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_PROGRESS, callBackObject);
 	}
 
+	public void readLoggedDataCompleted(String binFilePath) {
+		CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), new SyncProgressDetails(binFilePath));
+		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_COMPLETED, callBackObject);
+	}
+	
 	public void eraseDataCompleted() {
 		CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), true);
 		mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_VERISENSE_ERASE_DATA_COMPLETED, callBackObject);

ShimmerDriver/src/main/java/com/shimmerresearch/driver/shimmer4sdk/Shimmer4sdk.java

@@ -693,7 +693,7 @@ public void isNowStreamLoggedDataCallback() {
 				}
 
 				@Override
-				public void hasStopStreamLoggedDataCallback() {
+				public void hasStopStreamLoggedDataCallback(String binPath) {
 					// TODO Auto-generated method stub
 
 				}

ShimmerDriver/src/main/java/com/shimmerresearch/verisense/VerisenseDevice.java

@@ -1686,7 +1686,8 @@ public void isNowStreamLoggedDataCallback() {
 			}
 
 			@Override
-			public void hasStopStreamLoggedDataCallback() {
+			public void hasStopStreamLoggedDataCallback(String binFilePath) {
+				mDeviceCallbackAdapter.readLoggedDataCompleted(binFilePath);
 				// TODO Auto-generated method stub
 				setBluetoothRadioState(BT_STATE.CONNECTED);
 			}
@@ -1940,6 +1941,16 @@ public void readLoggedData() throws ShimmerException {
 		mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).readLoggedData();
 	}
 
+	public void setRootPathForBinFile(String path) {
+		mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).setRootPathForBinFile(path);
+	}
+	
+	public void deleteData() throws Exception {
+		
+			mapOfVerisenseProtocolByteCommunication.get(currentStreamingCommsRoute).eraseDataTask().waitForCompletion();
+		
+	}
+	
 	/**
 	 * @return Null if sensor not supported by current hardware
 	 * @see SensorLIS2DW12
@@ -2187,15 +2198,15 @@ public void setPendingEventScheduleRwcSync(PendingEventSchedule pendingEventSche
 	}
 
 	/**
-	 * The number of minute’s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
+	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
 	 * @return interval in minutes, if this value is set to either 0 or 65535 then the adaptive scheduler will never be turned on.
 	 */
 	public int getAdaptiveSchedulerInterval() {
 		return adaptiveSchedulerInterval;
 	}
 
 	/**
-	 * The number of minute’s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
+	 * The number of minute�s interval the ASM sensor will wait after a failed connection attempt before turning on the scheduler again
 	 * @param adaptiveSchedulerInterval interval in minutes, if this value is set to either 0 or 65535 then the adaptive scheduler will never be turned on.
 	 */
 	public void setAdaptiveSchedulerInterval(int adaptiveSchedulerInterval) {

ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/SyncProgressDetails.java

@@ -12,4 +12,7 @@ public SyncProgressDetails(int payloadIndex, boolean crcError, double transferRa
 		mTransferRateBytes = transferRateBytes;
 		mBinFilePath = binFilePath;
 	}
+	public SyncProgressDetails(String binFilePath) {
+		mBinFilePath = binFilePath;
+	}
 }

ShimmerDriver/src/main/java/com/shimmerresearch/verisense/communication/VerisenseProtocolByteCommunication.java

@@ -195,7 +195,7 @@ void handleResponse(VerisenseMessage verisenseMessage) {
 					resetFileNameOnStreamingLoggedDataFinish();
 					stateChange(VerisenseProtocolState.Connected);
 					for (RadioListener rl : mRadioListenerList) {
-						rl.hasStopStreamLoggedDataCallback();
+						rl.hasStopStreamLoggedDataCallback(getDataFilePath());
 					}
 				}
 

ShimmerDriverPC/src/main/java/com/shimmerresearch/driver/ble/BleRadioByteCommunication.java

@@ -188,7 +188,7 @@ public void connect() throws ShimmerException{
 		WriteDataToProcess("Connect");
 		mTaskConnect = new TaskCompletionSource<>();
 		try {
-			boolean result = mTaskConnect.getTask().waitForCompletion(2, TimeUnit.SECONDS);
+			boolean result = mTaskConnect.getTask().waitForCompletion(6, TimeUnit.SECONDS);
 			if (result) {
 
 			} else {

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

@@ -39,19 +39,27 @@ public class BasicShimmerBluetoothManagerPc extends ShimmerBluetoothManager {
 	List<String> shimmer3BleMacIdList = new ArrayList<String>();
 	List<VerisenseDevice> verisenseDeviceList = new ArrayList<VerisenseDevice>();
 	List<ShimmerGRPC> shimmer3BleDeviceList = new ArrayList<ShimmerGRPC>();
-	private boolean mInternalUse = true;
 	public static int mGRPCPort;
 
 	public BasicShimmerBluetoothManagerPc() {
 		startGrpc();
 	}
 
-	public BasicShimmerBluetoothManagerPc(boolean isInternalUse) {
-		if(isInternalUse) {
+	public BasicShimmerBluetoothManagerPc(boolean enableGRPC) {
+		if(enableGRPC) {
 			startGrpc();
 		}
 	}
 
+	protected void startGrpc(String path) {
+		try {
+			GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools("ShimmerBLEGrpc.exe",path);
+			mGRPCPort = grpcTool.startServer();
+		}  catch(Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
 	private void startGrpc() {
 		try {
 			GrpcBLERadioByteTools grpcTool = new GrpcBLERadioByteTools();