caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix bolus verification.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-26 03:02:52 +01:00
parent a0ba857279
commit 9ce57e7076
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
Bolus lastPumpBolus = reservoirBolusResult.lastBolus; Bolus lastPumpBolus = reservoirBolusResult.lastBolus;
if (cancelBolus) { if (cancelBolus) {
// if cancellation was requested, the delivered bolus is allowed to differ from requested // if cancellation was requested, the delivered bolus is allowed to differ from requested
} else if (lastPumpBolus == null || lastPumpBolus.amount != detailedBolusInfo.insulin) { } else if (lastPumpBolus == null || Math.abs(lastPumpBolus.amount - detailedBolusInfo.insulin) > 0.01
|| System.currentTimeMillis() - lastPumpBolus.timestamp > 5 * 60 * 1000) {
log.error("Bolus delivery failure at stage 6", new Exception()); log.error("Bolus delivery failure at stage 6", new Exception());
return new PumpEnactResult().success(false).enacted(false). return new PumpEnactResult().success(false).enacted(false).
comment(MainApp.sResources.getString(R.string.combo_pump_bolus_verification_failed)); comment(MainApp.sResources.getString(R.string.combo_pump_bolus_verification_failed));
@ -925,7 +926,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
} }
// there's a pump bolus AAPS doesn't know, or we only know one within the same minute but different amount // there's a pump bolus AAPS doesn't know, or we only know one within the same minute but different amount
if (pumpBolus != null && (aapsBolus == null || Math.abs(aapsBolus.insulin - pumpBolus.amount) >= 0.01)) { if (pumpBolus != null && (aapsBolus == null || Math.abs(aapsBolus.insulin - pumpBolus.amount) > 0.01)) {
log.debug("Last bolus on pump is unknown, refreshing bolus history"); log.debug("Last bolus on pump is unknown, refreshing bolus history");
request.bolusHistory = aapsBolus == null ? PumpHistoryRequest.FULL : aapsBolus.date; request.bolusHistory = aapsBolus == null ? PumpHistoryRequest.FULL : aapsBolus.date;
} }
@ -1093,7 +1094,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
battery = 25; battery = 25;
break; break;
default: default:
battery = 75; battery = 100;
break; break;
} }
batteryJson.put("percent", battery); batteryJson.put("percent", battery);