caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Cleanups around ComboPlugin.refreshDataFromPump.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-25 18:15:59 +02:00
parent 5ba68a86f0
commit 22bac709fb
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
2 changed files with 20 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -57,7 +57,8 @@ public class ComboPlugin implements PluginBase, PumpInterface {
private PumpDescription pumpDescription = new PumpDescription();
private RuffyCommands ruffyScripter;
@NonNull
private final RuffyCommands ruffyScripter;
// TODO access to pump (and its members) is chaotic and needs an update
private ComboPump pump = new ComboPump();
@ -80,7 +81,6 @@ public class ComboPlugin implements PluginBase, PumpInterface {
private ComboPlugin() {
definePumpCapabilities();
MainApp.bus().register(this);
ruffyScripter = RuffyCommandsV1Impl.getInstance(MainApp.instance());
}
@ -209,6 +209,22 @@ public class ComboPlugin implements PluginBase, PumpInterface {
return lastCmdResult != null ? new Date(lastCmdResult.completionTime) : new Date(0);
}
@Override
public synchronized void refreshDataFromPump(String reason) {
log.debug("RefreshDataFromPump called");
if (pump.lastCmdResult == null) {
initializePump();
} else {
runCommand("Refreshing", new CommandExecution() {
@Override
public CommandResult execute() {
return ruffyScripter.readHistory(new PumpHistoryRequest().reservoirLevel(true).bolusHistory(PumpHistoryRequest.LAST));
}
});
}
}
private void initializePump() {
CommandResult commandResult = runCommand("Checking pump history", false, new CommandExecution() {
@Override
@ -285,39 +301,6 @@ public class ComboPlugin implements PluginBase, PumpInterface {
}
// this method is regularly called from info.nightscout.androidaps.receivers.KeepAliveReceiver
// TODO check this is eithor called regularly even with other commansd being fired; if not,
// request this periodically
@Override
public synchronized void refreshDataFromPump(String reason) {
log.debug("RefreshDataFromPump called");
// if Android is sluggish this might get called before ruffy is bound
if (!ruffyScripter.isPumpAvailable()) {
log.error("Rejecting call to RefreshDataFromPump: scripter not ready yet.");
return;
}
// TODO
// boolean notAUserRequest = !reason.toLowerCase().contains("user");
// boolean wasRunAtLeastOnce = pump.lastCmdResult != null;
// boolean ranWithinTheLastMinute = wasRunAtLeastOnce && System.currentTimeMillis() < pump.lastCmdResult.completionTime + 60 * 1000;
// if (notAUserRequest && wasRunAtLeastOnce && ranWithinTheLastMinute) {
// log.debug("Not fetching state from pump, since we did already within the last 60 seconds");
// } else {
if (pump.lastCmdResult == null) {
initializePump();
} else {
runCommand("Refreshing", new CommandExecution() {
@Override
public CommandResult execute() {
return ruffyScripter.readHistory(new PumpHistoryRequest().reservoirLevel(true).bolusHistory(PumpHistoryRequest.LAST));
}
});
}
}
// TODO uses profile values for the time being
// this get's called multiple times a minute, must absolutely be cached
@Override

2
ruffyscripter/src/main/java/de/jotomo/ruffyscripter/RuffyCommandsV1Impl.java
View file

@ -1,6 +1,7 @@
package de.jotomo.ruffyscripter;
import android.content.Context;
import android.support.annotation.NonNull;
import java.util.Date;
@ -14,6 +15,7 @@ import de.jotomo.ruffy.spi.history.PumpHistoryRequest;
public class RuffyCommandsV1Impl implements RuffyCommands {
private static RuffyCommands delegate;
@NonNull
public static RuffyCommands getInstance(Context context) {
if (delegate == null) delegate = new RuffyScripter(context);
return delegate;