caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ComboPlugin.checkTbrMismatch: allow for deviations

Browse source 
to compensenate inprecise times used by pump for tbr duration.
This commit is contained in:
Johannes Mockenhaupt 2017-11-20 18:59:59 +01:00
parent aadb7c5728
commit dbd442e8ea
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -784,12 +784,12 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
private boolean checkForTbrMismatch(PumpState state) {
TemporaryBasal aapsTbr = MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
boolean sync = false;
if (aapsTbr == null && state.tbrActive) {
if (aapsTbr == null && state.tbrActive && state.tbrRemainingDuration <= 2) {
// pump runs TBR AAPS is unaware off
log.debug("Pump runs TBR AAPS is unaware of, cancelling TBR so it can be read from history properly");
runCommand(null, 0, ruffyScripter::cancelTbr);
sync = true;
} else if (aapsTbr != null && !state.tbrActive) {
} else if (aapsTbr != null && aapsTbr.getPlannedRemainingMinutes() > 2 && !state.tbrActive) {
// AAPS has a TBR but the pump isn't running a TBR
log.debug("AAPS shows TBR but pump isn't running a TBR; deleting TBR in AAPS and reading pump history");
MainApp.getDbHelper().delete(aapsTbr);