caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #778 from jotomo/774-combo-stop-mode-support

Browse source 
Combo: better STOP mode support
This commit is contained in:
Milos Kozak 2018-03-19 14:24:50 +01:00 committed by GitHub
commit 0b95d9ad0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -177,18 +177,19 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
String getStateSummary() { String getStateSummary() {
PumpState ps = pump.state; PumpState ps = pump.state;
if (!pump.initialized) { if (ps.activeAlert != null) {
return MainApp.gs(R.string.combo_pump_state_initializing);
} else if (!validBasalRateProfileSelectedOnPump) {
return MainApp.gs(R.string.loopdisabled);
} else if (ps.activeAlert != null) {
return ps.activeAlert.errorCode != null return ps.activeAlert.errorCode != null
? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message ? "E" + ps.activeAlert.errorCode + ": " + ps.activeAlert.message
: "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message; : "W" + ps.activeAlert.warningCode + ": " + ps.activeAlert.message;
} else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY)) } else if (ps.suspended && (ps.batteryState == PumpState.EMPTY || ps.insulinState == PumpState.EMPTY)) {
return MainApp.gs(R.string.combo_pump_state_suspended_due_to_error); return MainApp.gs(R.string.combo_pump_state_suspended_due_to_error);
else if (ps.suspended) } else if (ps.suspended) {
return MainApp.gs(R.string.combo_pump_state_suspended_by_user); return MainApp.gs(R.string.combo_pump_state_suspended_by_user);
} else if (!pump.initialized) {
return MainApp.gs(R.string.combo_pump_state_initializing);
} else if (!validBasalRateProfileSelectedOnPump) {
return MainApp.gs(R.string.loopdisabled);
}
return MainApp.gs(R.string.combo_pump_state_running); return MainApp.gs(R.string.combo_pump_state_running);
} }
@ -949,7 +950,6 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
* an error condition. Returns null otherwise. * an error condition. Returns null otherwise.
*/ */
private CommandResult runOnConnectChecks() { private CommandResult runOnConnectChecks() {
// connect, get status and check if an alarm is active
CommandResult preCheckResult = ruffyScripter.readPumpState(); CommandResult preCheckResult = ruffyScripter.readPumpState();
if (!preCheckResult.success) { if (!preCheckResult.success) {
return preCheckResult; return preCheckResult;
@ -977,13 +977,28 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
} }
} }
checkForUnsafeUsage(preCheckResult); if (!preCheckResult.state.suspended) {
checkAndResolveTbrMismatch(preCheckResult.state); checkForUnsafeUsage(preCheckResult);
checkPumpTime(preCheckResult.state); checkAndResolveTbrMismatch(preCheckResult.state);
checkBasalRate(preCheckResult.state); checkPumpTime(preCheckResult.state);
CommandResult historyCheckError = checkHistory(); checkBasalRate(preCheckResult.state);
if (historyCheckError != null) { CommandResult historyCheckError = checkHistory();
return historyCheckError; if (historyCheckError != null) {
return historyCheckError;
}
} else {
long now = System.currentTimeMillis();
TemporaryBasal aapsTbr = MainApp.getConfigBuilder().getTempBasalFromHistory(now);
if (aapsTbr == null || aapsTbr.percentRate != 0) {
log.debug("Creating 15m zero temp since pump is suspended");
TemporaryBasal newTempBasal = new TemporaryBasal();
newTempBasal.date = now;
newTempBasal.percentRate = 0;
newTempBasal.isAbsolute = false;
newTempBasal.durationInMinutes = 15;
newTempBasal.source = Source.USER;
MainApp.getConfigBuilder().addToHistoryTempBasal(newTempBasal);
}
} }
return null; return null;