From 9457fb61e538d7f57da778963ce3b600f9e0ae63 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Thu, 4 Jan 2018 11:05:19 +0100 Subject: [PATCH] RuffyScripter.isConnected: longer wait. Declare the connection dead if no menu update was sent within 10s. Occassionally it takes up 4s for regular updates to come in (possibly due to other busy background threads? Iob/Cob calc is suspiscously often running when the error occurs). With the previous timeout, commands were killed too early when things (pump, ruffy, aaps ...) needed some time to think). --- .../src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java index 77d5990792..2eb121111f 100644 --- a/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java @@ -187,10 +187,7 @@ public class RuffyScripter implements RuffyCommands { if (!ruffyService.isConnected()) { return false; } - if (System.currentTimeMillis() - menuLastUpdated >= 1500) { - waitForScreenUpdate(); - } - return System.currentTimeMillis() - menuLastUpdated < 1500; + return ruffyService.isConnected() && System.currentTimeMillis() - menuLastUpdated < 10 * 1000; } catch (RemoteException e) { return false; }