caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'feature_90-110-percent_savek-cc' into 'develop'

Browse source 
change cancel to 90 or 110 percent basal depending on previous running temp

See merge request !14
This commit is contained in:
Savek-CC 2017-08-07 20:18:44 +00:00
parent 07822811ac 59e9502f22
commit f3044a7cbb
1 changed files with 49 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -534,20 +534,57 @@ public class ComboPlugin implements PluginBase, PumpInterface {
@Override @Override
public PumpEnactResult cancelTempBasal() { public PumpEnactResult cancelTempBasal() {
log.debug("cancelTempBasal called"); log.debug("cancelTempBasal called");
CommandResult commandResult = runCommand(new CancelTbrCommand());
if (commandResult.enacted) { CommandResult commandResult = null;
TemporaryBasal tempStop = new TemporaryBasal(commandResult.completionTime); TemporaryBasal tempBasal = null;
tempStop.durationInMinutes = 0; // ending temp basal PumpEnactResult pumpEnactResult = new PumpEnactResult();
tempStop.source = Source.USER;
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder(); final TemporaryBasal activeTemp = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
treatmentsInterface.addToHistoryTempBasal(tempStop);
if (activeTemp == null) {
log.debug("cancelTempBasal: hard-cancelling TBR since user requested");
commandResult = runCommand(new CancelTbrCommand());
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(commandResult.completionTime);
tempBasal.durationInMinutes = 0;
tempBasal.source = Source.USER;
pumpEnactResult.isTempCancel = true;
}
} else if ((activeTemp.percentRate >= 90 && activeTemp.percentRate <= 110) && activeTemp.getPlannedRemainingMinutes() <= 15 ) {
// Let fake neutral temp keep running (see below)
log.debug("cancelTempBasal: skipping changing tbr since it already is at " + activeTemp.percentRate + "% and running for another " + activeTemp.getPlannedRemainingMinutes() + " mins.");
pumpEnactResult.comment = "cancelTempBasal skipping changing tbr since it already is at " + activeTemp.percentRate + "% and running for another " + activeTemp.getPlannedRemainingMinutes() + " mins.";
// TODO check what AAPS does with this; no DB update is required;
// looking at info/nightscout/androidaps/plugins/Loop/LoopPlugin.java:280
// both values are used as one:
// if (applyResult.enacted || applyResult.success) { ...
pumpEnactResult.enacted = true; // all fine though...
pumpEnactResult.success = true; // just roll with it...
} else {
// Set a fake neutral temp to avoid TBR cancel alert. Decide 90% vs 110% based on
// on whether the TBR we're cancelling is above or below 100%.
long percentage = (activeTemp.percentRate > 100) ? 110:90;
log.debug("cancelTempBasal: changing tbr to " + percentage + "% for 15 mins.");
commandResult = runCommand(new SetTbrCommand(percentage, 15));
if (commandResult.enacted) {
tempBasal = new TemporaryBasal(commandResult.completionTime);
tempBasal.durationInMinutes = 15;
tempBasal.source = Source.USER;
tempBasal.percentRate = (int) percentage;
tempBasal.isAbsolute = false;
}
} }
PumpEnactResult pumpEnactResult = new PumpEnactResult(); if (tempBasal != null) {
pumpEnactResult.success = commandResult.success; ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
pumpEnactResult.enacted = commandResult.enacted; treatmentsInterface.addToHistoryTempBasal(tempBasal);
pumpEnactResult.comment = commandResult.message; }
pumpEnactResult.isTempCancel = true;
if (commandResult != null) {
pumpEnactResult.success = commandResult.success;
pumpEnactResult.enacted = commandResult.enacted;
pumpEnactResult.comment = commandResult.message;
}
return pumpEnactResult; return pumpEnactResult;
} }