Skip to content
Snippets Groups Projects
Commit 0d9dd969 authored by Pogman's avatar Pogman
Browse files

using a read "pause" has no effect on outcome and likely redundant due to...

using a read "pause" has no effect on outcome and likely redundant due to clearMessage intercepting unread messages

changed the hardcoded 500 to use TIMEOUT_MS and set it to 0 while long term testing
parent 6f469d7c
No related branches found
No related tags found
No related merge requests found
...@@ -51,6 +51,8 @@ public class MedtronicCnlReader { ...@@ -51,6 +51,8 @@ public class MedtronicCnlReader {
private MedtronicCnlSession mPumpSession = new MedtronicCnlSession(); private MedtronicCnlSession mPumpSession = new MedtronicCnlSession();
private String mStickSerial = null; private String mStickSerial = null;
private static final int TIMEOUT_MS = 0; //500 note: using a read "pause" has no effect on outcome and likely redundant due to clearMessage intercepting unread messages
public MedtronicCnlReader(UsbHidDriver device) { public MedtronicCnlReader(UsbHidDriver device) {
mDevice = device; mDevice = device;
} }
...@@ -78,9 +80,9 @@ public class MedtronicCnlReader { ...@@ -78,9 +80,9 @@ public class MedtronicCnlReader {
doRetry = false; doRetry = false;
try { try {
new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.NAK) new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.NAK)
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.EOT); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.EOT);
new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.ENQ) new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.ENQ)
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
} catch (UnexpectedMessageException e2) { } catch (UnexpectedMessageException e2) {
try { try {
new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.EOT).send(mDevice); new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.EOT).send(mDevice);
...@@ -95,11 +97,11 @@ public class MedtronicCnlReader { ...@@ -95,11 +97,11 @@ public class MedtronicCnlReader {
public void enterPassthroughMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException { public void enterPassthroughMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException {
Log.d(TAG, "Begin enterPasshtroughMode"); Log.d(TAG, "Begin enterPasshtroughMode");
new ContourNextLinkCommandMessage("W|") new ContourNextLinkCommandMessage("W|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
new ContourNextLinkCommandMessage("Q|") new ContourNextLinkCommandMessage("Q|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
new ContourNextLinkCommandMessage("1|") new ContourNextLinkCommandMessage("1|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
Log.d(TAG, "Finished enterPasshtroughMode"); Log.d(TAG, "Finished enterPasshtroughMode");
} }
...@@ -224,18 +226,18 @@ public class MedtronicCnlReader { ...@@ -224,18 +226,18 @@ public class MedtronicCnlReader {
public void endPassthroughMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException { public void endPassthroughMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException {
Log.d(TAG, "Begin endPassthroughMode"); Log.d(TAG, "Begin endPassthroughMode");
new ContourNextLinkCommandMessage("W|") new ContourNextLinkCommandMessage("W|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
new ContourNextLinkCommandMessage("Q|") new ContourNextLinkCommandMessage("Q|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
new ContourNextLinkCommandMessage("0|") new ContourNextLinkCommandMessage("0|")
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ACK);
Log.d(TAG, "Finished endPassthroughMode"); Log.d(TAG, "Finished endPassthroughMode");
} }
public void endControlMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException { public void endControlMode() throws IOException, TimeoutException, UnexpectedMessageException, ChecksumException, EncryptionException {
Log.d(TAG, "Begin endControlMode"); Log.d(TAG, "Begin endControlMode");
new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.EOT) new ContourNextLinkCommandMessage(ContourNextLinkCommandMessage.ASCII.EOT)
.send(mDevice, 500).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ENQ); .send(mDevice, TIMEOUT_MS).checkControlMessage(ContourNextLinkCommandMessage.ASCII.ENQ);
Log.d(TAG, "Finished endControlMode"); Log.d(TAG, "Finished endControlMode");
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment