caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Don't count the time establishing a connection towards a command timeout.

Browse source 
Note: connection timeouts are also dealt with. They're now (cleanly)
separated: connect- and command-timeouts.

If the pump's display is one due to the user interacting with the pump
directly, the pump needs a display timeout before being ready for an
incoming connection. What I'm trying to say is, it might take some time,
maybe up to 30s to establish a connection in that cause and can thus
easily create a false timeout error.
This commit is contained in:
Johannes Mockenhaupt 2017-07-17 17:28:40 +02:00
parent 36966c8907
commit c37310685a
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
View file

@ -155,7 +155,9 @@ public class RuffyScripter {
CommandResult cmdResult; CommandResult cmdResult;
} }
/** Always returns a CommandResult, never throws */ /**
* Always returns a CommandResult, never throws
*/
public CommandResult runCommand(final Command cmd) { public CommandResult runCommand(final Command cmd) {
if (unrecoverableError != null) { if (unrecoverableError != null) {
return new CommandResult().success(false).enacted(false).message(unrecoverableError); return new CommandResult().success(false).enacted(false).message(unrecoverableError);
@ -168,6 +170,8 @@ public class RuffyScripter {
synchronized (RuffyScripter.class) { synchronized (RuffyScripter.class) {
try { try {
ensureConnected();
final RuffyScripter scripter = this; final RuffyScripter scripter = this;
activeCmd = cmd; activeCmd = cmd;
final Returnable returnable = new Returnable(); final Returnable returnable = new Returnable();
@ -175,19 +179,13 @@ public class RuffyScripter {
@Override @Override
public void run() { public void run() {
try { try {
ensureConnected();
// wait till pump is ready for input
waitForMenuUpdate();
// wait a bit longer to make extra sure we have a valid menu to work with
for (int i = 0; currentMenu == null && i < 20; i++) {
log.debug("Extra wait required before pump is ready");
SystemClock.sleep(50);
}
// check if pump is an an error state // check if pump is an an error state
if (currentMenu == null || currentMenu.getType() == MenuType.WARNING_OR_ERROR) { if (currentMenu == null || currentMenu.getType() == MenuType.WARNING_OR_ERROR) {
try { try {
PumpState pumpState = null; PumpState pumpState = null;
try { pumpState = readPumpState(); } catch (Exception e) { /* We tried ... */ } try {
pumpState = readPumpState();
} catch (Exception e) { /* We tried ... */ }
returnable.cmdResult = new CommandResult().message("Pump is in an error state: " + currentMenu.getAttribute(MenuAttribute.MESSAGE)).state(pumpState); returnable.cmdResult = new CommandResult().message("Pump is in an error state: " + currentMenu.getAttribute(MenuAttribute.MESSAGE)).state(pumpState);
return; return;
} catch (Exception e) { } catch (Exception e) {
@ -257,6 +255,7 @@ public class RuffyScripter {
} }
} }
/** If there's an issue, this times out eventually and throws a CommandException */
private void ensureConnected() { private void ensureConnected() {
boolean menuUpdateRecentlyReceived = currentMenu != null && menuLastUpdated + 1000 > System.currentTimeMillis(); boolean menuUpdateRecentlyReceived = currentMenu != null && menuLastUpdated + 1000 > System.currentTimeMillis();
log.debug("ensureConnect, connected: " + connected + ", receiving menu updates: " + menuUpdateRecentlyReceived); log.debug("ensureConnect, connected: " + connected + ", receiving menu updates: " + menuUpdateRecentlyReceived);
@ -265,19 +264,19 @@ public class RuffyScripter {
return; return;
} }
try { try {
boolean connectInitSuccessful = ruffyService.doRTConnect() == 0; boolean connectInitSuccessful = ruffyService.doRTConnect() == 0;
log.debug("Connect init successful: " + connectInitSuccessful); log.debug("Connect init successful: " + connectInitSuccessful);
while (currentMenu == null) { while (currentMenu == null) {
log.debug("Waiting for first menu update to be sent"); log.debug("Waiting for first menu update to be sent");
// waitForMenuUpdate times out after 60s and throws a CommandException // waitForMenuUpdate times out after 60s and throws a CommandException
waitForMenuUpdate(); waitForMenuUpdate();
}
connected = true;
} catch (RemoteException e) {
throw new CommandException().exception(e).message("Unexpected exception while initiating/restoring pump connection");
} }
connected = true;
} catch (RemoteException e) {
throw new CommandException().exception(e).message("Unexpected exception while initiating/restoring pump connection");
} }
}
// below: methods to be used by commands // below: methods to be used by commands
// TODO move into a new Operations(scripter) class commands can delegate to, // TODO move into a new Operations(scripter) class commands can delegate to,