caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging.

Browse source
This commit is contained in:
Andy Rozman 2018-05-10 12:40:31 +01:00
parent f5a23b2921
commit 6f19ad1407
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
View file

@ -311,6 +311,15 @@ public enum PumpType {
public PumpCapability getSpecialBasalDurations() { public PumpCapability getSpecialBasalDurations() {
return specialBasalDurations;
if (isParentSet())
{
return parent.getSpecialBasalDurations();
}
else
{
return specialBasalDurations == null ? //
PumpCapability.BasalRate_Duration15and30minNotAllowed : specialBasalDurations;
}
} }
} }

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
View file

@ -420,9 +420,13 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
PumpType pumpTypeNew = PumpType.getByDescription(pumptype); PumpType pumpTypeNew = PumpType.getByDescription(pumptype);
log.debug("Pump in configuration: {}, PumpType object: {}", pumptype, pumpTypeNew);
if (pumpType == pumpTypeNew) if (pumpType == pumpTypeNew)
return; return;
log.debug("New pump configuration found ({}), changing from previous ({})", pumpTypeNew, pumpType);
// reset // reset
pumpDescription.resetSettings(); pumpDescription.resetSettings();