caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix RuffyScripter.navigateToMenu one last time.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-24 23:05:46 +01:00
parent 5bd010d8f1
commit 71b32ac078
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -661,19 +661,20 @@ public class RuffyScripter implements RuffyCommands {
} }
public void navigateToMenu(MenuType desiredMenu) { public void navigateToMenu(MenuType desiredMenu) {
int retries = 20; verifyMenuIsDisplayed(MenuType.MAIN_MENU);
int moves = 20;
MenuType lastSeenMenu = getCurrentMenu().getType(); MenuType lastSeenMenu = getCurrentMenu().getType();
while (lastSeenMenu != desiredMenu) { while (lastSeenMenu != desiredMenu) {
log.debug("Navigating to menu " + desiredMenu + ", current menu: " + lastSeenMenu); log.debug("Navigating to menu " + desiredMenu + ", current menu: " + lastSeenMenu);
retries--; moves--;
if (retries == 0) { if (moves == 0) {
throw new CommandException("Menu not found searching for " + desiredMenu throw new CommandException("Menu not found searching for " + desiredMenu
+ ". Check menu settings on your pump to ensure it's not hidden."); + ". Check menu settings on your pump to ensure it's not hidden.");
} }
MenuType next = getCurrentMenu().getType();
pressMenuKey(); pressMenuKey();
// sometimes the pump takes a bit longer (more than one screen refresh) to advance // sometimes the pump takes a bit longer (more than one screen refresh) to advance
// to the next menu. wait until we actually see the change to avoid overshoots. // to the next menu. wait until we actually see the change to avoid overshoots.
MenuType next = getCurrentMenu().getType();
while (next == lastSeenMenu) { while (next == lastSeenMenu) {
waitForScreenUpdate(); waitForScreenUpdate();
next = getCurrentMenu().getType(); next = getCurrentMenu().getType();