From c0589d50f7d64153ab872714db80709e2b8be5f4 Mon Sep 17 00:00:00 2001
From: Volker Richert <v.richert@addmore.de>
Date: Sat, 17 Dec 2016 14:46:08 +0100
Subject: [PATCH] really send messages to pump....
---
.../medtronic/message/ChannelNegotiateRequestMessage.java | 1 +
.../medtronic/message/ChannelNegotiateResponseMessage.java | 4 ++--
.../medtronic/message/CloseConnectionRequestMessage.java | 2 +-
.../medtronic/message/CloseConnectionResponseMessage.java | 6 +++---
.../medtronic/message/OpenConnectionRequestMessage.java | 2 +-
.../medtronic/message/OpenConnectionResponseMessage.java | 6 +++---
.../medtronic/message/PumpBasalPatternRequestMessage.java | 2 ++
.../android/medtronic/message/PumpTimeRequestMessage.java | 2 ++
8 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateRequestMessage.java
index 7f9bfe3..7fc63bb 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateRequestMessage.java
@@ -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");
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateResponseMessage.java
index 13e261c..63d6fe6 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/ChannelNegotiateResponseMessage.java
@@ -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();
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionRequestMessage.java
index 7d85310..c7a47bf 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionRequestMessage.java
@@ -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;
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionResponseMessage.java
index 4155e8f..d1d101e 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/CloseConnectionResponseMessage.java
@@ -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
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionRequestMessage.java
index 054ef1c..1218b76 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionRequestMessage.java
@@ -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;
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionResponseMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionResponseMessage.java
index 3228182..1f8e6df 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionResponseMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/OpenConnectionResponseMessage.java
@@ -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
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/PumpBasalPatternRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpBasalPatternRequestMessage.java
index 22ec2aa..accdd14 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/PumpBasalPatternRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpBasalPatternRequestMessage.java
@@ -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);
diff --git a/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
index c372b7d..45d36c6 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/message/PumpTimeRequestMessage.java
@@ -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);
--
GitLab