caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Untested: don't false trigger dynamic timeout in RS.runCommand.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-12 12:37:16 +01:00
parent 9606df13b7
commit ab8d3051b3
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 7 additions and 2 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

@ -284,8 +284,6 @@ public class RuffyScripter implements RuffyCommands {
long dynamicTimeout = calculateCmdInactivityTimeout(); long dynamicTimeout = calculateCmdInactivityTimeout();
long overallTimeout = calculateOverallCmdTimeout(); long overallTimeout = calculateOverallCmdTimeout();
while (cmdThread.isAlive()) { while (cmdThread.isAlive()) {
log.trace("Waiting for running command to complete");
SystemClock.sleep(500);
if (!ruffyService.isConnected()) { if (!ruffyService.isConnected()) {
// on connection lose try to reconnect, confirm warning alerts caused by // on connection lose try to reconnect, confirm warning alerts caused by
// the disconnected and then return the command as failed (the caller // the disconnected and then return the command as failed (the caller
@ -307,6 +305,11 @@ public class RuffyScripter implements RuffyCommands {
boolean menuRecentlyUpdated = now < menuLastUpdated + 5 * 1000; boolean menuRecentlyUpdated = now < menuLastUpdated + 5 * 1000;
boolean idlingInMainMenu = getCurrentMenu().getType() == MenuType.MAIN_MENU boolean idlingInMainMenu = getCurrentMenu().getType() == MenuType.MAIN_MENU
&& !getCurrentMenu().attributes().contains(MenuAttribute.BOLUS_REMAINING); && !getCurrentMenu().attributes().contains(MenuAttribute.BOLUS_REMAINING);
// TODO this triggers falsely if command finished and idles in main menu until
// conneciton is closed; probably better since wait is moved to bottom of loop
// so the while(cmdThread.isAlive) check and this isn't 500ms apart.
// still, think this through; maybe wait a fec seconds and recheck if command is
// active and menu is still main menu ...
if (menuRecentlyUpdated && !idlingInMainMenu) { if (menuRecentlyUpdated && !idlingInMainMenu) {
// command still working (or waiting for pump to complete, e.g. bolus delivery) // command still working (or waiting for pump to complete, e.g. bolus delivery)
dynamicTimeout = now + 30 * 1000; dynamicTimeout = now + 30 * 1000;
@ -324,6 +327,8 @@ public class RuffyScripter implements RuffyCommands {
activeCmd.getResult().success = false; activeCmd.getResult().success = false;
break; break;
} }
log.trace("Waiting for running command to complete");
SystemClock.sleep(500);
} }
activeCmd.getResult().state = readPumpStateInternal(); activeCmd.getResult().state = readPumpStateInternal();