caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-01-31 11:59:30 +01:00
parent 47ce9d8561
commit 5bb8bdde3e
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java
View file

@ -185,19 +185,8 @@ public class BolusCommand extends BaseCommand {
}
if (cancelInProgress) {
log.debug("Stage 4: reading last bolus from pump history since a cancellation was requested during bolus delivery");
ReadQuickInfoCommand readQuickInfoCommand = new ReadQuickInfoCommand();
readQuickInfoCommand.setScripter(scripter);
readQuickInfoCommand.execute();
CommandResult quickInfoResult = readQuickInfoCommand.result;
Bolus lastBolus = quickInfoResult.history != null && !quickInfoResult.history.bolusHistory.isEmpty()
? quickInfoResult.history.bolusHistory.get(0)
: null;
if (lastBolus == null || Math.abs(System.currentTimeMillis() - lastBolus.timestamp) >= 10 * 60 * 1000) {
throw new CommandException("Unable to determine last bolus");
}
log.debug("Stage 4: " + lastBolus.amount + " U delivered before cancellation according to history");
this.result.delivered = lastBolus.amount;
log.debug("Stage 4: bolus was cancelled, with unknown amount delivered");
this.result.delivered = -1;
} else {
log.debug("Stage 4: full bolus of " + bolus + " U was successfully delivered");
result.delivered = bolus;