caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Bolusing: make cancellation during 'confirmation wait window' robust.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-12-15 22:38:28 +01:00
parent b9f12aeddb
commit 7e7b11ba14
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java
View file

@ -19,7 +19,6 @@ import de.jotomo.ruffyscripter.RuffyScripter;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.DELIVERED;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.DELIVERING;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.FINISHED;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.PROGRAMMING;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.STOPPED;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.STOPPING;
@ -128,6 +127,15 @@ public class BolusCommand extends BaseCommand {
}
Integer warningCode = warningOrErrorCode.warningCode;
if (Objects.equals(warningCode, PumpWarningCodes.BOLUS_CANCELLED)) {
// wait until cancellation thread releases the up button, otherwise we won't
// be able to confirm anything
if (cancellationThread != null) {
try {
cancellationThread.join(3500);
} catch (InterruptedException e) {
// ignore
}
}
scripter.confirmAlert(PumpWarningCodes.BOLUS_CANCELLED, 2000);
bolusProgressReporter.report(STOPPED, 0, 0);
log.debug("Stage 3: confirmed BOLUS CANCELLED after cancelling bolus during delivery");
@ -184,7 +192,7 @@ public class BolusCommand extends BaseCommand {
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");
log.debug("Stage 4: " + lastBolus.amount + " U delivered before cancellation according to history");
result.delivered = lastBolus.amount;
} else {
log.debug("Stage 4: full bolus of " + bolus + " U was successfully delivered");