caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2061 from andyrozman/bug_1969_error_decoding_basal_profile

Browse source 
Bug 1969 error decoding basal profile
This commit is contained in:
Milos Kozak 2019-09-20 08:01:03 +02:00 committed by GitHub
parent a903ff6eea bdf65ab077
commit a8f68e1182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
View file

@ -703,7 +703,6 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
// create message // create message
PumpMessage msg; PumpMessage msg;
// if (bodyData == null)
msg = makePumpMessage(commandType); msg = makePumpMessage(commandType);
// send and wait for response // send and wait for response
@ -718,8 +717,6 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
byte[] data = null; byte[] data = null;
int runs = 1;
if (check == null) { if (check == null) {
data = response.getRawContentOfFrame(); data = response.getRawContentOfFrame();
@ -728,24 +725,21 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
while (checkIfWeHaveMoreData(commandType, response, data)) { while (checkIfWeHaveMoreData(commandType, response, data)) {
runs++; response = sendAndListen(ackMsg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
PumpMessage response2 = sendAndListen(ackMsg, DEFAULT_TIMEOUT + (DEFAULT_TIMEOUT * retries));
// LOG.debug("{} Response: {}", runs, HexDump.toHexStringDisplayable(response2.getRawContent())); // LOG.debug("{} Response: {}", runs, HexDump.toHexStringDisplayable(response2.getRawContent()));
// LOG.debug("{} Response: {}", runs, // LOG.debug("{} Response: {}", runs,
// HexDump.toHexStringDisplayable(response2.getMessageBody().getTxData())); // HexDump.toHexStringDisplayable(response2.getMessageBody().getTxData()));
String check2 = checkResponseContent(response2, commandType.commandDescription, 1); String check2 = checkResponseContent(response, commandType.commandDescription, 1);
if (check2 == null) { if (check2 == null) {
data = ByteUtil.concat(data, response2.getRawContentOfFrame()); data = ByteUtil.concat(data, response.getRawContentOfFrame());
} else { } else {
this.errorMessage = check2; this.errorMessage = check2;
if (isLogEnabled()) LOG.error("Error with response got GetProfile: " + check2);
LOG.debug("Error message: " + check2);
} }
} }
@ -784,12 +778,11 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
if (commandType == MedtronicCommandType.GetBasalProfileSTD || // if (commandType == MedtronicCommandType.GetBasalProfileSTD || //
commandType == MedtronicCommandType.GetBasalProfileA || // commandType == MedtronicCommandType.GetBasalProfileA || //
commandType == MedtronicCommandType.GetBasalProfileB) { commandType == MedtronicCommandType.GetBasalProfileB) {
byte[] responseRaw = response.getRawContent(); byte[] responseRaw = response.getRawContentOfFrame();
int last = responseRaw.length - 1; int last = responseRaw.length - 1;
if (isLogEnabled()) LOG.debug("Length: " + data.length);
LOG.debug("Length: " + data.length);
if (data.length >= BasalProfile.MAX_RAW_DATA_SIZE) { if (data.length >= BasalProfile.MAX_RAW_DATA_SIZE) {
return false; return false;
@ -954,7 +947,7 @@ public class MedtronicCommunicationManager extends RileyLinkCommunicationManager
LOG.warn("Error getting response from RileyLink (error={}, retry={})", e.getMessage(), retries + 1); LOG.warn("Error getting response from RileyLink (error={}, retry={})", e.getMessage(), retries + 1);
} }
if (responseMessage!=null) if (responseMessage != null)
LOG.warn("Set Basal Profile: Invalid response: commandType={},rawData={}", responseMessage.commandType, ByteUtil.shortHexString(responseMessage.getRawContent())); LOG.warn("Set Basal Profile: Invalid response: commandType={},rawData={}", responseMessage.commandType, ByteUtil.shortHexString(responseMessage.getRawContent()));
else else
LOG.warn("Set Basal Profile: Null response."); LOG.warn("Set Basal Profile: Null response.");

7
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/message/PumpMessage.java
View file

@ -22,6 +22,8 @@ public class PumpMessage implements RLMessage {
public MessageBody messageBody = new MessageBody(); public MessageBody messageBody = new MessageBody();
public String error = null; public String error = null;
public static final int FRAME_DATA_LENGTH = 64;
public PumpMessage(String error) { public PumpMessage(String error) {
this.error = error; this.error = error;
@ -129,9 +131,10 @@ public class PumpMessage implements RLMessage {
return arrayOut; return arrayOut;
} }
public byte[] getRawContentOfFrame() { public byte[] getRawContentOfFrame() {
byte[] raw = getRawContent(); byte[] raw = messageBody.getTxData();
return ByteUtil.substring(raw, 0, raw.length - 1); return ByteUtil.substring(raw, 1, Math.min(FRAME_DATA_LENGTH, raw.length - 1));
} }

14
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/defs/MedtronicDeviceType.java
View file

@ -105,9 +105,9 @@ public enum MedtronicDeviceType {
} }
public static boolean isLargerFormat(MedtronicDeviceType model) { // public static boolean isLargerFormat(MedtronicDeviceType model) {
return isSameDevice(model, Medtronic_523andHigher); // return isSameDevice(model, Medtronic_523andHigher);
} // }
public boolean isFamily() { public boolean isFamily() {
@ -120,13 +120,17 @@ public enum MedtronicDeviceType {
} }
public boolean isLargerFormat() { // public boolean isLargerFormat() {
// return isSameDevice(this, Medtronic_523andHigher);
// }
public boolean isMedtronic_523orHigher() {
return isSameDevice(this, Medtronic_523andHigher); return isSameDevice(this, Medtronic_523andHigher);
} }
public int getBolusStrokes() { public int getBolusStrokes() {
return (isLargerFormat(this)) ? 40 : 10; return (isMedtronic_523orHigher()) ? 40 : 10;
} }