caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Don't create a cancel record for requests to cancel a TBR when none is running.

Browse source 
(cherry picked from commit a46b475)
This commit is contained in:
Johannes Mockenhaupt 2018-02-07 16:11:08 +01:00
parent 6fb5f5bad4
commit 6b36dd27d8
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -785,19 +785,33 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
return OPERATION_NOT_SUPPORTED;
}
/** Cancel an active Temp Basal. Mostly sets a fake Temp Basal to avoid a TBR CANCELLED
* alert. This relies on TemporaryBasal objects to properly reflect the pumps state,
* which is ensured by {@link #checkAndResolveTbrMismatch(PumpState)}, which runs on each
* connect. When a hard cancel is requested, the pump is queried for it's TBR state to
* make absolutely sure no TBR is running (such a request is also made when resuming the
* loop, irregardless of whether a TBR is running or not).
*/
@Override
public PumpEnactResult cancelTempBasal(boolean enforceNew) {
log.debug("cancelTempBasal called");
final TemporaryBasal activeTemp = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
if (enforceNew) {
log.debug("cancelTempBasal: hard-cancelling TBR since force requested");
CommandResult commandResult = runCommand(MainApp.gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
if (!commandResult.success) {
CommandResult stateResult = runCommand(MainApp.gs(R.string.combo_pump_action_refreshing), 2, ruffyScripter::readPumpState);
if (!stateResult.success) {
return new PumpEnactResult().success(false).enacted(false);
}
if (!commandResult.state.tbrActive) {
if (!stateResult.state.tbrActive) {
return new PumpEnactResult().success(true).enacted(false);
}
log.debug("cancelTempBasal: hard-cancelling TBR since force requested");
CommandResult cancelResult = runCommand(MainApp.gs(R.string.combo_pump_action_cancelling_tbr), 2, ruffyScripter::cancelTbr);
if (!cancelResult.success) {
return new PumpEnactResult().success(false).enacted(false);
}
if (!cancelResult.state.tbrActive) {
TemporaryBasal tempBasal = new TemporaryBasal();
tempBasal.date = commandResult.state.timestamp;
tempBasal.date = cancelResult.state.timestamp;
tempBasal.durationInMinutes = 0;
tempBasal.source = Source.USER;
MainApp.getConfigBuilder().addToHistoryTempBasal(tempBasal);