caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Workaound for #27 (TBR issued twice).

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-08-27 14:45:06 +02:00
parent 0705755368
commit 7bd7c7d035
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -12,6 +12,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import de.jotomo.ruffyscripter.PumpState;
public class SetTbrCommand extends BaseCommand { public class SetTbrCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class); private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);
@ -53,11 +55,24 @@ public class SetTbrCommand extends BaseCommand {
@Override @Override
public CommandResult execute() { public CommandResult execute() {
try { try {
boolean cancellingTbr = percentage == 100;
PumpState pumpState = scripter.readPumpState();
// TODO hack, cancelling a TBR that isn't running is dealt with in CancelTbrCommand,
// this avoids setting a TBR twice until that AAPS bug is squished which calls this
// twice within a minute GL#27
if (!cancellingTbr
&& pumpState.tbrActive
&& pumpState.tbrPercent == percentage
&& (pumpState.tbrRemainingDuration == duration || pumpState.tbrRemainingDuration + 1 == duration)) {
return new CommandResult().success(true).enacted(false).message("Requested TBR already running");
}
enterTbrMenu(); enterTbrMenu();
inputTbrPercentage(); inputTbrPercentage();
verifyDisplayedTbrPercentage(); verifyDisplayedTbrPercentage();
if (percentage == 100) { if (cancellingTbr) {
cancelTbrAndConfirmCancellationWarning(); cancelTbrAndConfirmCancellationWarning();
} else { } else {
// switch to TBR_DURATION menu by pressing menu key // switch to TBR_DURATION menu by pressing menu key
@ -79,7 +94,7 @@ public class SetTbrCommand extends BaseCommand {
"Check pump manually, the TBR might not have been set/cancelled."); "Check pump manually, the TBR might not have been set/cancelled.");
// check main menu shows the same values we just set // check main menu shows the same values we just set
if (percentage == 100) { if (cancellingTbr) {
verifyMainMenuShowsNoActiveTbr(); verifyMainMenuShowsNoActiveTbr();
return new CommandResult().success(true).enacted(true).message("TBR was cancelled"); return new CommandResult().success(true).enacted(true).message("TBR was cancelled");
} else { } else {