Skip TBR changes smaller than 20%.
~50 TBR changes in a 6 hour night seem excessive, even if pump was handicapped by not being connected and thus not having any effect to work with.
This commit is contained in:
parent
a2b3c26b33
commit
8b21bb1203
1 changed files with 14 additions and 0 deletions
|
@ -51,6 +51,9 @@ public class ComboPlugin implements PluginBase, PumpInterface {
|
||||||
|
|
||||||
PumpDescription pumpDescription = new PumpDescription();
|
PumpDescription pumpDescription = new PumpDescription();
|
||||||
|
|
||||||
|
// TODO quick hack until pump state is more thoroughly supported
|
||||||
|
int activeTbrPercentage = -1;
|
||||||
|
|
||||||
private RuffyScripter ruffyScripter;
|
private RuffyScripter ruffyScripter;
|
||||||
private Date lastCmdTime = new Date(0);
|
private Date lastCmdTime = new Date(0);
|
||||||
private ServiceConnection mRuffyServiceConnection;
|
private ServiceConnection mRuffyServiceConnection;
|
||||||
|
@ -329,6 +332,15 @@ public class ComboPlugin implements PluginBase, PumpInterface {
|
||||||
log.debug("Rounded requested percentage from " + percent + " to " + rounded);
|
log.debug("Rounded requested percentage from " + percent + " to " + rounded);
|
||||||
percent = rounded;
|
percent = rounded;
|
||||||
}
|
}
|
||||||
|
if (activeTbrPercentage != -1 && Math.abs(activeTbrPercentage - percent) <= 20) {
|
||||||
|
log.debug("Not bothering the pump for a small TBR change from " + activeTbrPercentage + "% -> " + percent + "%");
|
||||||
|
PumpEnactResult pumpEnactResult = new PumpEnactResult();
|
||||||
|
pumpEnactResult.success = true;
|
||||||
|
pumpEnactResult.enacted = false;
|
||||||
|
pumpEnactResult.percent = activeTbrPercentage;
|
||||||
|
pumpEnactResult.comment = "TBR change too small, skipping";
|
||||||
|
return pumpEnactResult;
|
||||||
|
}
|
||||||
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
|
MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
|
||||||
CommandResult commandResult = runCommand(new SetTbrCommand(percent, durationInMinutes));
|
CommandResult commandResult = runCommand(new SetTbrCommand(percent, durationInMinutes));
|
||||||
if (commandResult.enacted) {
|
if (commandResult.enacted) {
|
||||||
|
@ -339,6 +351,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
|
||||||
tempStart.source = Source.USER;
|
tempStart.source = Source.USER;
|
||||||
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
|
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
|
||||||
treatmentsInterface.addToHistoryTempBasal(tempStart);
|
treatmentsInterface.addToHistoryTempBasal(tempStart);
|
||||||
|
activeTbrPercentage = percent;
|
||||||
}
|
}
|
||||||
|
|
||||||
PumpEnactResult pumpEnactResult = new PumpEnactResult();
|
PumpEnactResult pumpEnactResult = new PumpEnactResult();
|
||||||
|
@ -369,6 +382,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
|
||||||
tempStop.source = Source.USER;
|
tempStop.source = Source.USER;
|
||||||
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
|
ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
|
||||||
treatmentsInterface.addToHistoryTempBasal(tempStop);
|
treatmentsInterface.addToHistoryTempBasal(tempStop);
|
||||||
|
activeTbrPercentage = 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
PumpEnactResult pumpEnactResult = new PumpEnactResult();
|
PumpEnactResult pumpEnactResult = new PumpEnactResult();
|
||||||
|
|
Loading…
Reference in a new issue