caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Issue a history read when bolusing fails.

Browse source 
(cherry picked from commit cafed14)
This commit is contained in:
Johannes Mockenhaupt 2017-11-25 21:15:47 +01:00
parent 1d83abc0d2
commit 0f8442d65c
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,7 +432,12 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
.comment(MainApp.instance().getString(R.string.danar_invalidinput));
} else if (detailedBolusInfo.insulin > 0) {
// bolus needed, ask pump to deliver it
return deliverBolus(detailedBolusInfo);
PumpEnactResult pumpEnactResult = deliverBolus(detailedBolusInfo);
if (!pumpEnactResult.success) {
log.debug("Bolus delivery failed, refreshing history in background thread");
new Thread(this::checkPumpHistory).start();
}
return pumpEnactResult;
} else {
// no bolus required, carb only treatment
MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
@ -482,7 +487,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
// verify we're update to date and know the most recent bolus
if (!Objects.equals(lastKnownBolus, reservoirBolusResult.lastBolus)) {
new Thread(this::checkPumpHistory).start();
log.error("Bolus delivery failure at stage 3", new Exception());
return new PumpEnactResult().success(false).enacted(false)
.comment(MainApp.sResources.getString(R.string.combo_pump_bolus_history_state_mismatch));
}