Skip to content
Snippets Groups Projects
Commit c0589d50 authored by Volker Richert's avatar Volker Richert
Browse files

really send messages to pump....

parent 628f544c
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 10 deletions
......@@ -23,6 +23,7 @@ public class ChannelNegotiateRequestMessage extends MedtronicRequestMessage {
}
public ChannelNegotiateResponseMessage send(UsbHidDriver mDevice) throws IOException, TimeoutException, ChecksumException, EncryptionException {
sendMessage(mDevice);
// Don't care what the 0x81 response message is at this stage
Log.d(TAG, "negotiateChannel: Reading 0x81 message");
......
......@@ -9,13 +9,13 @@ import info.nightscout.android.medtronic.exception.EncryptionException;
/**
* Created by lgoedhart on 27/03/2016.
*/
public class ChannelNegotiateResponseMessage extends MedtronicResponseMessage {
public class ChannelNegotiateResponseMessage extends ContourNextLinkBinaryResponseMessage {
private static final String TAG = ChannelNegotiateResponseMessage.class.getSimpleName();
private byte radioChannel = 0;
protected ChannelNegotiateResponseMessage(MedtronicCnlSession pumpSession, byte[] payload) throws EncryptionException, ChecksumException {
super(pumpSession, payload);
super(payload);
byte[] responseBytes = this.encode();
......
......@@ -20,7 +20,7 @@ public class CloseConnectionRequestMessage extends ContourNextLinkBinaryRequestM
public CloseConnectionResponseMessage send(UsbHidDriver mDevice) throws IOException, TimeoutException, EncryptionException, ChecksumException {
sendMessage(mDevice);
CloseConnectionResponseMessage response = new CloseConnectionResponseMessage(mPumpSession, readMessage(mDevice));
CloseConnectionResponseMessage response = new CloseConnectionResponseMessage(readMessage(mDevice));
// FIXME - We need to care what the response message is - wrong MAC and all that
return response;
......
......@@ -7,9 +7,9 @@ import info.nightscout.android.medtronic.exception.EncryptionException;
/**
* Created by lgoedhart on 10/05/2016.
*/
public class CloseConnectionResponseMessage extends MedtronicResponseMessage {
protected CloseConnectionResponseMessage(MedtronicCnlSession pumpSession, byte[] payload) throws ChecksumException, EncryptionException {
super(pumpSession, payload);
public class CloseConnectionResponseMessage extends ContourNextLinkBinaryResponseMessage {
protected CloseConnectionResponseMessage(byte[] payload) throws ChecksumException, EncryptionException {
super(payload);
}
}
\ No newline at end of file
......@@ -20,7 +20,7 @@ public class OpenConnectionRequestMessage extends ContourNextLinkBinaryRequestMe
public OpenConnectionResponseMessage send(UsbHidDriver mDevice) throws IOException, TimeoutException, EncryptionException, ChecksumException {
sendMessage(mDevice);
OpenConnectionResponseMessage response = new OpenConnectionResponseMessage(mPumpSession, readMessage(mDevice));
OpenConnectionResponseMessage response = new OpenConnectionResponseMessage(readMessage(mDevice));
// FIXME - We need to care what the response message is - wrong MAC and all that
return response;
......
......@@ -7,9 +7,9 @@ import info.nightscout.android.medtronic.exception.EncryptionException;
/**
* Created by lgoedhart on 10/05/2016.
*/
public class OpenConnectionResponseMessage extends MedtronicResponseMessage {
protected OpenConnectionResponseMessage(MedtronicCnlSession pumpSession, byte[] payload) throws ChecksumException, EncryptionException {
super(pumpSession, payload);
public class OpenConnectionResponseMessage extends ContourNextLinkBinaryResponseMessage {
protected OpenConnectionResponseMessage(byte[] payload) throws ChecksumException, EncryptionException {
super(payload);
}
}
\ No newline at end of file
......@@ -17,6 +17,8 @@ public class PumpBasalPatternRequestMessage extends MedtronicRequestMessage {
}
public PumpBasalPatternResponseMessage send(UsbHidDriver mDevice) throws IOException, TimeoutException, ChecksumException, EncryptionException {
sendMessage(mDevice);
// Read the 0x81
readMessage(mDevice);
......
......@@ -17,6 +17,8 @@ public class PumpTimeRequestMessage extends MedtronicRequestMessage {
}
public PumpTimeResponseMessage send(UsbHidDriver mDevice) throws IOException, TimeoutException, ChecksumException, EncryptionException {
sendMessage(mDevice);
// Read the 0x81
readMessage(mDevice);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment