From 17c3f5442f85e736267157fd4ebb8a2fed11dcd8 Mon Sep 17 00:00:00 2001 From: Lennart Goedhart <LGoedhart@ea.com> Date: Sat, 26 Mar 2016 16:42:41 +1100 Subject: [PATCH] Commit working version of Uploader before refactoring messages to be "classier". --- .idea/vcs.xml | 2 +- .../android/medtronic/MedtronicCNLReader.java | 40 +++++++++---------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 6564d52..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="" vcs="" /> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project> \ No newline at end of file diff --git a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java b/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java index 8f42b67..e3aad63 100644 --- a/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java +++ b/app/src/main/java/com/nightscout/android/medtronic/MedtronicCNLReader.java @@ -4,8 +4,8 @@ import android.util.Log; import com.nightscout.android.USB.UsbHidDriver; import com.nightscout.android.dexcom.USB.HexDump; -import com.nightscout.android.medtronic.message.ContourNextLinkBinaryMessage; import com.nightscout.android.medtronic.message.ChannelNegotiateMessage; +import com.nightscout.android.medtronic.message.ContourNextLinkBinaryMessage; import com.nightscout.android.medtronic.service.MedtronicCNLService; import java.io.ByteArrayOutputStream; @@ -24,25 +24,9 @@ public class MedtronicCNLReader { private static final String BAYER_USB_HEADER = "ABC"; private static final byte[] RADIO_CHANNELS = { 0x14, 0x11, 0x0e, 0x17, 0x1a }; - - public enum ASCII { - STX(0x02), - EOT(0x04), - ENQ(0x05), - ACK(0x06), - NAK(0x15); - - private byte value; - - ASCII(int code) { - this.value = (byte) code; - } - } - + public String deviceInfo; private UsbHidDriver mDevice; private MedtronicCNLSession mPumpSession = new MedtronicCNLSession(); - public String deviceInfo; - public MedtronicCNLReader(UsbHidDriver device) { mDevice = device; } @@ -51,8 +35,8 @@ public class MedtronicCNLReader { ByteArrayOutputStream responseMessage = new ByteArrayOutputStream(); byte[] responseBuffer = new byte[USB_BLOCKSIZE]; - int bytesRead = 0; - int messageSize = 0; + int bytesRead; + int messageSize; do { bytesRead = mDevice.read(responseBuffer, READ_TIMEOUT_MS); @@ -133,7 +117,7 @@ public class MedtronicCNLReader { public void openConnection() throws IOException { ContourNextLinkBinaryMessage message = new ContourNextLinkBinaryMessage(ContourNextLinkBinaryMessage.CommandType.OPEN_CONNECTION, mPumpSession, mPumpSession.getHMAC()); - message.send(this); + //message.send(this); sendMessage(message.encode()); // FIXME - We need to care what the response message is - wrong MAC and all that readMessage(); @@ -152,4 +136,18 @@ public class MedtronicCNLReader { sendMessage(message.encode()); } } + + public enum ASCII { + STX(0x02), + EOT(0x04), + ENQ(0x05), + ACK(0x06), + NAK(0x15); + + private byte value; + + ASCII(int code) { + this.value = (byte) code; + } + } } -- GitLab