caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Implement additional methods

Browse source
This commit is contained in:
Jamorham 2018-01-31 09:53:31 +00:00
parent ce0650a495
commit d07d9d309e
No known key found for this signature in database
GPG key ID: 0BC5C3E0AAD64DF9
2 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
View file

@ -41,10 +41,10 @@ import info.nightscout.androidaps.plugins.PumpInsight.utils.StatusItem;
import info.nightscout.utils.DateUtil;
import info.nightscout.utils.NSUpload;
import info.nightscout.utils.SP;
import sugar.free.sightparser.applayer.messages.AppLayerMessage;
import sugar.free.sightparser.applayer.descriptors.ActiveBolus;
import sugar.free.sightparser.applayer.descriptors.ActiveBolusType;
import sugar.free.sightparser.applayer.descriptors.PumpStatus;
import sugar.free.sightparser.applayer.messages.AppLayerMessage;
import sugar.free.sightparser.applayer.messages.remote_control.CancelTBRMessage;
import sugar.free.sightparser.applayer.messages.remote_control.ExtendedBolusMessage;
import sugar.free.sightparser.applayer.messages.remote_control.StandardBolusMessage;
@ -134,7 +134,6 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
pumpDescription.tempDurationStep = 15; // 15 minutes up to 24 hours
pumpDescription.tempMaxDuration = 24 * 60;
pumpDescription.isSetBasalProfileCapable = false; // leave this for now
pumpDescription.basalStep = 0.01d;
pumpDescription.basalMinimumRate = 0.02d;
@ -253,7 +252,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
@Override
public boolean isSuspended() {
return false;
return !isPumpRunning();
}
@Override
@ -266,10 +265,9 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
return Connector.get().isPumpConnected();
}
// TODO implement
@Override
public boolean isConnecting() {
return false;
return Connector.get().isPumpConnecting();
}
@Override
@ -311,6 +309,21 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
@Override
public void stopConnecting() {
log("InsightPumpPlugin::stopConnecting()");
try {
if (isConnecting()) {
if (!SP.getBoolean("insight_always_connected", false)) {
log("Requesting disconnect");
connector.getServiceConnector().disconnect();
} else {
log("Not disconnecting due to preference");
}
} else {
log("Not currently trying to connect so not stopping connection");
}
} catch (NullPointerException e) {
log("Could not stop connecting - null pointer: " + e);
}
}
@Override
@ -411,10 +424,16 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
return result;
}
// TODO implement
@Override
public void stopBolusDelivering() {
final UUID cmd = aSyncTaskRunner(new CancelBolusTaskRunner(connector.getServiceConnector(), ActiveBolusType.STANDARD), "Cancel standard bolus");
if (cmd == null) {
return;
}
final Cstatus cs = async.busyWaitForCommandResult(cmd, BUSY_WAIT_TIME);
log("Got command status: " + cs);
}
// Temporary Basals
@ -574,7 +593,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
extendedBolus.date = System.currentTimeMillis();
extendedBolus.insulin = insulin;
extendedBolus.durationInMinutes = durationInMinutes;
extendedBolus.source = Source.USER; // TODO check this is correct
extendedBolus.source = Source.USER;
MainApp.getConfigBuilder().addToHistoryExtendedBolus(extendedBolus);
}
@ -607,7 +626,6 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
if (MainApp.getConfigBuilder().isInHistoryExtendedBoluslInProgress()) {
ExtendedBolus exStop = new ExtendedBolus(System.currentTimeMillis());
exStop.source = Source.USER;
// TODO does this need any specific cancel flag?
MainApp.getConfigBuilder().addToHistoryExtendedBolus(exStop);
}
@ -710,6 +728,11 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
return MainApp.instance().getString(id);
}
private boolean isPumpRunning() {
if (statusResult == null) return true; // assume running if we have no information
return statusResult.getPumpStatusMessage().getPumpStatus() == PumpStatus.STARTED;
}
List<StatusItem> getStatusItems() {
final List<StatusItem> l = new ArrayList<>();
@ -722,7 +745,7 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface {
// also check time since received
if (statusResult != null) {
pumpRunning = statusResult.getPumpStatusMessage().getPumpStatus() == PumpStatus.STARTED;
pumpRunning = isPumpRunning();
if (pumpRunning) {
l.add(new StatusItem(gs(R.string.pump_basebasalrate_label), getBaseBasalRateString() + "U"));
} else {

5
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/connector/Connector.java
View file

@ -30,7 +30,6 @@ import static sugar.free.sightparser.handling.SightService.COMPATIBILITY_VERSION
public class Connector {
//public static final String ACTION_START_RESYNC = "sugar.free.sightremote.services.HistorySyncService.START_RESYNC";
private static final String TAG = "InsightConnector";
private static final String COMPANION_APP_PACKAGE = "sugar.free.sightremote";
private final static long FRESH_MS = 70000;
@ -194,6 +193,10 @@ public class Connector {
return isConnected() && getLastStatus() == Status.CONNECTED;
}
public boolean isPumpConnecting() {
return isConnected() && getLastStatus() == Status.CONNECTING;
}
public String getLastStatusMessage() {
if (!companionAppInstalled) {