caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Check active menu again when retrying inputs.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-18 10:24:45 +02:00
parent abf9566476
commit 3b287df77d
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,6 +100,7 @@ public class BolusCommand implements Command {
} }
private void inputBolusAmount(RuffyScripter scripter) { private void inputBolusAmount(RuffyScripter scripter) {
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
// press 'up' once for each 0.1 U increment // press 'up' once for each 0.1 U increment
long steps = Math.round(bolus * 10); long steps = Math.round(bolus * 10);
for (int i = 0; i < steps; i++) { for (int i = 0; i < steps; i++) {
@ -110,6 +111,7 @@ public class BolusCommand implements Command {
} }
private void verifyDisplayedBolusAmount(RuffyScripter scripter) { private void verifyDisplayedBolusAmount(RuffyScripter scripter) {
scripter.verifyMenuIsDisplayed(MenuType.BOLUS_ENTER);
double displayedBolus = readDisplayedBolusAmount(scripter); double displayedBolus = readDisplayedBolusAmount(scripter);
log.debug("Final bolus: " + displayedBolus); log.debug("Final bolus: " + displayedBolus);
if (Math.abs(displayedBolus - bolus) > 0.05) { if (Math.abs(displayedBolus - bolus) > 0.05) {

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

@ -157,6 +157,7 @@ public class SetTbrCommand implements Command {
} }
private void verifyDisplayedTbrPercentage(RuffyScripter scripter) { private void verifyDisplayedTbrPercentage(RuffyScripter scripter) {
scripter.verifyMenuIsDisplayed(MenuType.TBR_SET);
long displayedPercentage = readDisplayedTbrPercentage(scripter); long displayedPercentage = readDisplayedTbrPercentage(scripter);
if (displayedPercentage != this.percentage) { if (displayedPercentage != this.percentage) {
log.debug("Final displayed TBR percentage: " + displayedPercentage); log.debug("Final displayed TBR percentage: " + displayedPercentage);
@ -176,6 +177,7 @@ public class SetTbrCommand implements Command {
} }
private void inputTbrDuration(RuffyScripter scripter) { private void inputTbrDuration(RuffyScripter scripter) {
scripter.verifyMenuIsDisplayed(MenuType.TBR_DURATION);
long currentDuration = readDisplayedTbrDuration(scripter); long currentDuration = readDisplayedTbrDuration(scripter);
if (currentDuration % 15 != 0) { if (currentDuration % 15 != 0) {
// The duration displayed is how long an active TBR will still run, // The duration displayed is how long an active TBR will still run,