Skip to content

Commit c45db1d

Browse files
committed
parsing functional
1 parent b348161 commit c45db1d

6 files changed

Lines changed: 10 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public interface RadioListener {
2626
public void isNowStreamingCallback();
2727
public void hasStopStreamingCallback();
2828
public void isNowStreamLoggedDataCallback();
29-
public void hasStopStreamLoggedDataCallback();
29+
public void hasStopStreamLoggedDataCallback(String binPath);
3030
public void initialiseStreamingCallback();
3131

3232
// public void eventSyncStates(boolean isDocked, boolean isInitialised, boolean isSdLogging, boolean isSensing, boolean isStreaming, boolean haveAttemptedToRead);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public void newSyncPayloadReceived(int payloadIndex, boolean crcError, double tr
107107
mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_PROGRESS, callBackObject);
108108
}
109109

110-
public void readLoggedDataCompleted() {
111-
CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), true);
110+
public void readLoggedDataCompleted(String binFilePath) {
111+
CallbackObject callBackObject = new CallbackObject(getMacId(), getComPort(), new SyncProgressDetails(binFilePath));
112112
mShimmerDevice.sendCallBackMsg(ShimmerBluetooth.MSG_IDENTIFIER_SYNC_COMPLETED, callBackObject);
113113
}
114114

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ public void isNowStreamLoggedDataCallback() {
693693
}
694694

695695
@Override
696-
public void hasStopStreamLoggedDataCallback() {
696+
public void hasStopStreamLoggedDataCallback(String binPath) {
697697
// TODO Auto-generated method stub
698698

699699
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,8 +1686,8 @@ public void isNowStreamLoggedDataCallback() {
16861686
}
16871687

16881688
@Override
1689-
public void hasStopStreamLoggedDataCallback() {
1690-
mDeviceCallbackAdapter.readLoggedDataCompleted();
1689+
public void hasStopStreamLoggedDataCallback(String binFilePath) {
1690+
mDeviceCallbackAdapter.readLoggedDataCompleted(binFilePath);
16911691
// TODO Auto-generated method stub
16921692
setBluetoothRadioState(BT_STATE.CONNECTED);
16931693
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ public SyncProgressDetails(int payloadIndex, boolean crcError, double transferRa
1212
mTransferRateBytes = transferRateBytes;
1313
mBinFilePath = binFilePath;
1414
}
15+
public SyncProgressDetails(String binFilePath) {
16+
mBinFilePath = binFilePath;
17+
}
1518
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void handleResponse(VerisenseMessage verisenseMessage) {
195195
resetFileNameOnStreamingLoggedDataFinish();
196196
stateChange(VerisenseProtocolState.Connected);
197197
for (RadioListener rl : mRadioListenerList) {
198-
rl.hasStopStreamLoggedDataCallback();
198+
rl.hasStopStreamLoggedDataCallback(getDataFilePath());
199199
}
200200
}
201201

0 commit comments

Comments
 (0)