Merge branch 'virtual_pump_Bug863' into riley_link_medtronic
This commit is contained in:
Andy Rozman
commit
f6110bd096
|
|
@ -37,4 +37,40 @@ public class PumpDescription {
|
|||
public boolean isRefillingCapable = false;
|
||||
|
||||
public boolean storesCarbInfo = true;
|
||||
|
||||
|
||||
public void resetSettings()
|
||||
{
|
||||
isBolusCapable = true;
|
||||
bolusStep = 0.1d;
|
||||
|
||||
isExtendedBolusCapable = true;
|
||||
extendedBolusStep = 0.1d;
|
||||
extendedBolusDurationStep = 30;
|
||||
extendedBolusMaxDuration = 12 * 60;
|
||||
|
||||
isTempBasalCapable = true;
|
||||
tempBasalStyle = PERCENT;
|
||||
|
||||
maxTempPercent = 200;
|
||||
tempPercentStep = 10;
|
||||
|
||||
maxTempAbsolute = 10;
|
||||
tempAbsoluteStep = 0.05d;
|
||||
|
||||
tempDurationStep = 60;
|
||||
tempMaxDuration = 12 * 60;
|
||||
|
||||
|
||||
isSetBasalProfileCapable = true;
|
||||
basalStep = 0.01d;
|
||||
basalMinimumRate = 0.04d;
|
||||
|
||||
isRefillingCapable = false;
|
||||
|
||||
storesCarbInfo = true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,49 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.data;
|
||||
|
||||
/**
|
||||
* Created by andy on 02/05/2018.
|
||||
*/
|
||||
|
||||
public class DoseSettings {
|
||||
|
||||
private float step;
|
||||
private int durationStep;
|
||||
private int maxDuration;
|
||||
private float minDose;
|
||||
private Float maxDose;
|
||||
|
||||
public DoseSettings(float step, int durationStep, int maxDuration, float minDose, Float maxDose)
|
||||
{
|
||||
this.step = step;
|
||||
this.durationStep = durationStep;
|
||||
this.maxDuration = maxDuration;
|
||||
this.minDose = minDose;
|
||||
this.maxDose = maxDose;
|
||||
}
|
||||
|
||||
public DoseSettings(float step, int durationStep, int maxDuration, float minDose)
|
||||
{
|
||||
this(step, durationStep, maxDuration, minDose, null);
|
||||
}
|
||||
|
||||
|
||||
public float getStep() {
|
||||
return step;
|
||||
}
|
||||
|
||||
public int getDurationStep() {
|
||||
return durationStep;
|
||||
}
|
||||
|
||||
public int getMaxDuration() {
|
||||
return maxDuration;
|
||||
}
|
||||
|
||||
public float getMinDose() {
|
||||
return minDose;
|
||||
}
|
||||
|
||||
public Float getMaxDose() {
|
||||
return maxDose;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.defs;
|
||||
|
||||
/**
|
||||
* Created by andy on 02/05/2018.
|
||||
*/
|
||||
|
||||
public enum DoseStepSize
|
||||
{
|
||||
|
||||
ComboBasal( //
|
||||
new DoseStepSizeEntry(0f, 1f, 0.01f), //
|
||||
new DoseStepSizeEntry(1f, 10f, 0.05f), //
|
||||
new DoseStepSizeEntry(10f, Float.MAX_VALUE, 0.1f)), //
|
||||
|
||||
MedtronicVeoBasal( //
|
||||
new DoseStepSizeEntry(0f, 1f, 0.025f), //
|
||||
new DoseStepSizeEntry(1f, 10f, 0.05f), //
|
||||
new DoseStepSizeEntry(10f, Float.MAX_VALUE, 0.1f)), //
|
||||
|
||||
;
|
||||
|
||||
|
||||
DoseStepSizeEntry[] entries;
|
||||
|
||||
|
||||
DoseStepSize(DoseStepSizeEntry...entries)
|
||||
{
|
||||
this.entries = entries;
|
||||
}
|
||||
|
||||
|
||||
public float getStepSizeForAmount(float amount)
|
||||
{
|
||||
for (DoseStepSizeEntry entry : entries) {
|
||||
if (entry.from <= amount && entry.to > amount)
|
||||
return entry.value;
|
||||
}
|
||||
|
||||
// should never come to this
|
||||
return entries[entries.length-1].value;
|
||||
}
|
||||
|
||||
|
||||
public String getDescription() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
for (DoseStepSizeEntry entry : entries) {
|
||||
|
||||
sb.append(entry.value);
|
||||
sb.append(" {");
|
||||
sb.append(entry.from);
|
||||
sb.append("-");
|
||||
|
||||
if (entry.to == Float.MAX_VALUE)
|
||||
{
|
||||
sb.append("~}");
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.append(entry.to);
|
||||
sb.append("}, ");
|
||||
}
|
||||
}
|
||||
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
|
||||
static class DoseStepSizeEntry
|
||||
{
|
||||
float from;
|
||||
float to;
|
||||
float value;
|
||||
|
||||
// to = this value is not included, but would actually mean <, so for rates between 0.025-0.975 u/h, we would have [from=0, to=10]
|
||||
DoseStepSizeEntry(float from, float to, float value)
|
||||
{
|
||||
this.from = from;
|
||||
this.to = to;
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.defs;
|
||||
|
||||
/**
|
||||
* Created by andy on 03/05/2018.
|
||||
*/
|
||||
|
||||
public enum PumpCapability {
|
||||
|
||||
Bolus, //
|
||||
ExtendedBolus, //
|
||||
TBR, //
|
||||
BasalProfileSet, //
|
||||
Refill, //
|
||||
StoreCarbInfo, //
|
||||
|
||||
// grouped
|
||||
VirtualPump(Bolus, ExtendedBolus, TBR, BasalProfileSet, StoreCarbInfo), //
|
||||
|
||||
Bolus_TBR_Basal_Refill_Carb(Bolus, TBR, BasalProfileSet, Refill, StoreCarbInfo), //
|
||||
Bolus_Extended_TBR_Basal_Carb(Bolus, ExtendedBolus, TBR, BasalProfileSet, StoreCarbInfo), //
|
||||
Bolus_Extended_TBR_Basal_Refill_Carb(Bolus, ExtendedBolus, TBR, BasalProfileSet, Refill, StoreCarbInfo), //
|
||||
|
||||
;
|
||||
|
||||
PumpCapability[] children;
|
||||
|
||||
|
||||
PumpCapability()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
PumpCapability(PumpCapability...children)
|
||||
{
|
||||
this.children = children;
|
||||
}
|
||||
|
||||
|
||||
public boolean hasCapability(PumpCapability capability)
|
||||
{
|
||||
// we can only check presense of simple capabilities
|
||||
if (capability.children != null)
|
||||
return false;
|
||||
|
||||
if (this == capability)
|
||||
return true;
|
||||
|
||||
if (this.children!=null)
|
||||
{
|
||||
for (PumpCapability child : children) {
|
||||
if (child == capability)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.defs;
|
||||
|
||||
/**
|
||||
* Created by andy on 02/05/2018.
|
||||
*/
|
||||
|
||||
public enum PumpTempBasalType {
|
||||
Percent, //
|
||||
Absolute,
|
||||
}
|
||||
|
|
@ -0,0 +1,303 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.defs;
|
||||
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import info.nightscout.androidaps.interfaces.PumpDescription;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.data.DoseSettings;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Created by andy on 02/05/2018.
|
||||
*
|
||||
* Most of this defintions is intended for VirtualPump only, but they can be used by other plugins.
|
||||
*/
|
||||
|
||||
public enum PumpType {
|
||||
|
||||
GenericAAPS("Generic AAPS", 0.1f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Percent, //
|
||||
new DoseSettings(10,30, 24*60, 0f, 500f), //
|
||||
0.01f, 0.01f, null, PumpCapability.VirtualPump), //
|
||||
|
||||
// Cellnovo
|
||||
|
||||
Cellnovo1("Cellnovo", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 24*60, 1f, null),
|
||||
PumpTempBasalType.Percent,
|
||||
new DoseSettings(5,30, 24*60, 0f, 200f), //
|
||||
0.05f, 0.05f, null, PumpCapability.VirtualPump), //
|
||||
|
||||
// Accu-Chek
|
||||
|
||||
AccuChekCombo("Accu-Chek Combo", 0.1f, null, //
|
||||
new DoseSettings(0.1f, 15, 12*60, 0.1f), //
|
||||
PumpTempBasalType.Percent,
|
||||
new DoseSettings(10, 15, 12*60,0f, 500f), //
|
||||
0.01f, 0.1f, DoseStepSize.ComboBasal, PumpCapability.Bolus_TBR_Basal_Refill_Carb), //
|
||||
|
||||
AccuChekSpirit("Accu-Chek Spirit", 0.1f, null, //
|
||||
new DoseSettings(0.1f, 15, 12*60, 0.1f), //
|
||||
PumpTempBasalType.Percent,
|
||||
new DoseSettings(10, 15, 12*60,0f, 500f), //
|
||||
0.01f, 0.1f, null, PumpCapability.VirtualPump), //
|
||||
|
||||
|
||||
// Animas
|
||||
AnimasVibe("Animas Vibe", 0.05f, null, // AnimasBolus?
|
||||
new DoseSettings(0.05f, 30, 12*60, 0.05f), //
|
||||
PumpTempBasalType.Percent, //
|
||||
new DoseSettings(10, 30, 24*60, 0f, 200f), //
|
||||
0.025f, 5f, 0f, null, PumpCapability.VirtualPump), //
|
||||
|
||||
AnimasPing("Animas Ping", AnimasVibe),
|
||||
|
||||
// Dana
|
||||
DanaR("DanaR", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Percent, //
|
||||
new DoseSettings(10f, 60, 24*60, 0f, 200f), //
|
||||
0.04f, 0.01f, null, PumpCapability.Bolus_Extended_TBR_Basal_Refill_Carb),
|
||||
|
||||
DanaRKorean("DanaR Korean", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Percent, //
|
||||
new DoseSettings(10f, 60, 24*60, 0f, 200f), //
|
||||
0.1f, 0.01f, null, PumpCapability.Bolus_Extended_TBR_Basal_Refill_Carb),
|
||||
|
||||
DanaRS("DanaRS", DanaR),
|
||||
DanaRv2("DanaRv2", DanaR),
|
||||
|
||||
|
||||
// Insulet
|
||||
Insulet_Omnipod("Insulet Omnipod", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Absolute, //
|
||||
new DoseSettings(0.05f, 30, 12*60, 0f, 5.0f), // cannot exceed max basal rate 30u/hr
|
||||
0.05f, 0.05f, null, PumpCapability.VirtualPump),
|
||||
|
||||
// Medtronic
|
||||
Minimed_512_712("Medtronic 512/712", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Absolute, //
|
||||
new DoseSettings(0.05f, 30, 24*60, 0f, 35f), //
|
||||
0.05f, 0.05f, null, PumpCapability.VirtualPump), // TODO
|
||||
|
||||
Minimed_515_715("Medtronic 515/715", Minimed_512_712),
|
||||
Minimed_522_722("Medtronic 522/722", Minimed_512_712),
|
||||
Minimed_523_723("Medtronic 523/723", Minimed_512_712),
|
||||
|
||||
Minimed_553_753_Revel("Medtronic 553/753 (Revel)", 0.05f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Absolute, //
|
||||
new DoseSettings(0.05f, 30, 24*60, 0f, 35f), //
|
||||
0.025f, 0.025f, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPump), //
|
||||
|
||||
Minimed_554_754_Veo("Medtronic 554/754 (Veo)", Minimed_553_753_Revel), // TODO
|
||||
|
||||
Minimed_640G("Medtronic 640G", 0.025f, null, //
|
||||
new DoseSettings(0.05f, 30, 8*60, 0.05f), //
|
||||
PumpTempBasalType.Absolute, //
|
||||
new DoseSettings(0.05f, 30, 24*60, 0f, 35f), //
|
||||
0.025f, 0.025f, DoseStepSize.MedtronicVeoBasal, PumpCapability.VirtualPump), //
|
||||
|
||||
// Tandem
|
||||
TandemTSlim("Tandem t:slim", 0.01f, null, //
|
||||
new DoseSettings(0.01f,15, 8*60, 0.4f) ,
|
||||
PumpTempBasalType.Percent,
|
||||
new DoseSettings(1,15, 8*60, 0f, 250f), //
|
||||
0.1f, 0.001f, null, PumpCapability.VirtualPump),
|
||||
|
||||
TandemTFlex("Tandem t:flex", TandemTSlim), //
|
||||
TandemTSlimG4("Tandem t:slim G4", TandemTSlim), //
|
||||
TandemTSlimX2("Tandem t:slim X2", TandemTSlim), //
|
||||
;
|
||||
|
||||
private String description;
|
||||
private float bolusSize;
|
||||
private DoseStepSize specialBolusSize;
|
||||
private DoseSettings extendedBolusSettings;
|
||||
private PumpTempBasalType pumpTempBasalType;
|
||||
private DoseSettings tbrSettings;
|
||||
private float baseBasalMinValue; //
|
||||
private Float baseBasalMaxValue;
|
||||
private float baseBasalStep; //
|
||||
private DoseStepSize baseBasalSpecialSteps; //
|
||||
private PumpCapability pumpCapability;
|
||||
|
||||
private PumpType parent;
|
||||
private static Map<String,PumpType> mapByDescription;
|
||||
|
||||
static
|
||||
{
|
||||
mapByDescription = new HashMap<>();
|
||||
|
||||
for (PumpType pumpType : values()) {
|
||||
mapByDescription.put(pumpType.getDescription(), pumpType);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
PumpType(String description, PumpType parent)
|
||||
{
|
||||
this.description = description;
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
PumpType(String description, PumpType parent, PumpCapability pumpCapability)
|
||||
{
|
||||
this.description = description;
|
||||
this.parent = parent;
|
||||
this.pumpCapability = pumpCapability;
|
||||
}
|
||||
|
||||
PumpType(String description, float bolusSize, DoseStepSize specialBolusSize, //
|
||||
DoseSettings extendedBolusSettings, //
|
||||
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, //
|
||||
float baseBasalMinValue, float baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
|
||||
{
|
||||
this(description, bolusSize, specialBolusSize, extendedBolusSettings, pumpTempBasalType, tbrSettings, baseBasalMinValue, null, baseBasalStep, baseBasalSpecialSteps, pumpCapability);
|
||||
}
|
||||
|
||||
PumpType(String description, float bolusSize, DoseStepSize specialBolusSize, //
|
||||
DoseSettings extendedBolusSettings, //
|
||||
PumpTempBasalType pumpTempBasalType, DoseSettings tbrSettings, //
|
||||
float baseBasalMinValue, Float baseBasalMaxValue, float baseBasalStep, DoseStepSize baseBasalSpecialSteps, PumpCapability pumpCapability)
|
||||
{
|
||||
this.description = description;
|
||||
this.bolusSize = bolusSize;
|
||||
this.specialBolusSize = specialBolusSize;
|
||||
this.extendedBolusSettings = extendedBolusSettings;
|
||||
this.pumpTempBasalType = pumpTempBasalType;
|
||||
this.tbrSettings = tbrSettings;
|
||||
this.baseBasalMinValue = baseBasalMinValue;
|
||||
this.baseBasalMaxValue = baseBasalMaxValue;
|
||||
this.baseBasalStep = baseBasalStep;
|
||||
this.baseBasalSpecialSteps = baseBasalSpecialSteps;
|
||||
this.pumpCapability = pumpCapability;
|
||||
}
|
||||
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public PumpCapability getPumpCapability() {
|
||||
|
||||
if (isParentSet())
|
||||
return this.pumpCapability == null ? parent.pumpCapability : pumpCapability;
|
||||
else
|
||||
return this.pumpCapability;
|
||||
}
|
||||
|
||||
public float getBolusSize() {
|
||||
return isParentSet() ? parent.bolusSize : bolusSize;
|
||||
}
|
||||
|
||||
|
||||
public DoseStepSize getSpecialBolusSize() {
|
||||
return isParentSet() ? parent.specialBolusSize : specialBolusSize;
|
||||
}
|
||||
|
||||
|
||||
public DoseSettings getExtendedBolusSettings() {
|
||||
return isParentSet() ? parent.extendedBolusSettings : extendedBolusSettings;
|
||||
}
|
||||
|
||||
|
||||
public PumpTempBasalType getPumpTempBasalType() {
|
||||
return isParentSet() ? parent.pumpTempBasalType : pumpTempBasalType;
|
||||
}
|
||||
|
||||
|
||||
public DoseSettings getTbrSettings() {
|
||||
return isParentSet() ? parent.tbrSettings : tbrSettings;
|
||||
}
|
||||
|
||||
|
||||
public float getBaseBasalMinValue() {
|
||||
return isParentSet() ? parent.baseBasalMinValue : baseBasalMinValue;
|
||||
}
|
||||
|
||||
|
||||
public Float getBaseBasalMaxValue() {
|
||||
return isParentSet() ? parent.baseBasalMaxValue : baseBasalMaxValue;
|
||||
}
|
||||
|
||||
|
||||
public float getBaseBasalStep() {
|
||||
return isParentSet() ? parent.baseBasalStep : baseBasalStep;
|
||||
}
|
||||
|
||||
|
||||
public DoseStepSize getBaseBasalSpecialSteps() {
|
||||
return isParentSet() ? parent.baseBasalSpecialSteps : baseBasalSpecialSteps;
|
||||
}
|
||||
|
||||
|
||||
public PumpType getParent() {
|
||||
return parent;
|
||||
}
|
||||
|
||||
|
||||
private boolean isParentSet()
|
||||
{
|
||||
return this.parent!=null;
|
||||
}
|
||||
|
||||
|
||||
public static PumpType getByDescription(String desc)
|
||||
{
|
||||
if (mapByDescription.containsKey(desc))
|
||||
{
|
||||
return mapByDescription.get(desc);
|
||||
}
|
||||
else
|
||||
{
|
||||
return PumpType.GenericAAPS;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public String getFullDescription(String i18nTemplate) {
|
||||
|
||||
String unit = getPumpTempBasalType()==PumpTempBasalType.Percent ? "%" : "";
|
||||
|
||||
DoseSettings eb = getExtendedBolusSettings();
|
||||
DoseSettings tbr = getTbrSettings();
|
||||
|
||||
return String.format(i18nTemplate, //
|
||||
getStep("" + getBolusSize(), getSpecialBolusSize()), //
|
||||
eb.getStep(), eb.getDurationStep(), eb.getMaxDuration()/60, //
|
||||
getStep(getBaseBasalRange(), getBaseBasalSpecialSteps()), //
|
||||
tbr.getMinDose() + unit + "-" + tbr.getMaxDose() + unit, tbr.getStep() + unit, tbr.getDurationStep(), tbr.getMaxDuration()/60);
|
||||
}
|
||||
|
||||
|
||||
private String getBaseBasalRange()
|
||||
{
|
||||
Float maxValue = getBaseBasalMaxValue();
|
||||
|
||||
return maxValue==null ? "" + getBaseBasalMinValue() : getBaseBasalMinValue() + "-" + maxValue;
|
||||
}
|
||||
|
||||
|
||||
private String getStep(String step, DoseStepSize stepSize)
|
||||
{
|
||||
if (stepSize!=null)
|
||||
return step + " [" + stepSize.getDescription() + "] *";
|
||||
else
|
||||
return "" + step;
|
||||
}
|
||||
|
||||
|
||||
public boolean hasExtendedBasals() {
|
||||
return ((getBaseBasalSpecialSteps() !=null) || (getSpecialBolusSize() != null));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
package info.nightscout.androidaps.plugins.PumpCommon.utils;
|
||||
|
||||
import info.nightscout.androidaps.interfaces.PumpDescription;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpCapability;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpTempBasalType;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
|
||||
|
||||
/**
|
||||
* Created by andy on 02/05/2018.
|
||||
*/
|
||||
|
||||
public class PumpUtil {
|
||||
|
||||
public static void setPumpDescription(PumpDescription pumpDescription, PumpType pumpType)
|
||||
{
|
||||
setPumpDescription(pumpDescription, pumpType, false);
|
||||
}
|
||||
|
||||
public static void setPumpDescription(PumpDescription pumpDescription, PumpType pumpType, boolean isVirtualPump)
|
||||
{
|
||||
PumpCapability pumpCapability = isVirtualPump ? PumpCapability.VirtualPump : pumpType.getPumpCapability();
|
||||
|
||||
pumpDescription.isBolusCapable = pumpCapability.hasCapability(PumpCapability.Bolus);
|
||||
pumpDescription.bolusStep = pumpType.getBolusSize();
|
||||
|
||||
pumpDescription.isExtendedBolusCapable = pumpCapability.hasCapability(PumpCapability.ExtendedBolus);
|
||||
pumpDescription.extendedBolusStep = pumpType.getExtendedBolusSettings().getStep();
|
||||
pumpDescription.extendedBolusDurationStep = pumpType.getExtendedBolusSettings().getDurationStep();
|
||||
pumpDescription.extendedBolusMaxDuration = pumpType.getExtendedBolusSettings().getMaxDuration();
|
||||
|
||||
pumpDescription.isTempBasalCapable = pumpCapability.hasCapability(PumpCapability.TBR);
|
||||
|
||||
if (pumpType.getPumpTempBasalType()==PumpTempBasalType.Percent)
|
||||
{
|
||||
pumpDescription.tempBasalStyle = PumpDescription.PERCENT;
|
||||
pumpDescription.maxTempPercent = pumpType.getTbrSettings().getMaxDose().intValue();
|
||||
pumpDescription.tempPercentStep = (int)pumpType.getTbrSettings().getStep();
|
||||
}
|
||||
else
|
||||
{
|
||||
pumpDescription.tempBasalStyle = PumpDescription.ABSOLUTE;
|
||||
pumpDescription.maxTempAbsolute = pumpType.getTbrSettings().getMaxDose();
|
||||
pumpDescription.tempAbsoluteStep = pumpType.getTbrSettings().getStep();
|
||||
}
|
||||
|
||||
pumpDescription.tempDurationStep = pumpType.getTbrSettings().getDurationStep();
|
||||
pumpDescription.tempMaxDuration = pumpType.getTbrSettings().getMaxDuration();
|
||||
|
||||
|
||||
pumpDescription.isSetBasalProfileCapable = pumpCapability.hasCapability(PumpCapability.BasalProfileSet);
|
||||
pumpDescription.basalStep = pumpType.getBaseBasalStep();
|
||||
pumpDescription.basalMinimumRate = pumpType.getBaseBasalMinValue();
|
||||
|
||||
pumpDescription.isRefillingCapable = pumpCapability.hasCapability(PumpCapability.Refill);
|
||||
pumpDescription.storesCarbInfo = pumpCapability.hasCapability(PumpCapability.StoreCarbInfo);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
|
|||
import info.nightscout.androidaps.MainApp;
|
||||
import info.nightscout.androidaps.R;
|
||||
import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
|
||||
import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
|
||||
|
||||
public class VirtualPumpFragment extends SubscriberFragment {
|
||||
|
|
@ -29,6 +30,9 @@ public class VirtualPumpFragment extends SubscriberFragment {
|
|||
TextView extendedBolusView;
|
||||
TextView batteryView;
|
||||
TextView reservoirView;
|
||||
TextView pumpTypeView;
|
||||
TextView pumpSettingsView;
|
||||
|
||||
|
||||
private static Handler sLoopHandler = new Handler();
|
||||
private static Runnable sRefreshLoop = null;
|
||||
|
|
@ -58,6 +62,8 @@ public class VirtualPumpFragment extends SubscriberFragment {
|
|||
extendedBolusView = (TextView) view.findViewById(R.id.virtualpump_extendedbolus);
|
||||
batteryView = (TextView) view.findViewById(R.id.virtualpump_battery);
|
||||
reservoirView = (TextView) view.findViewById(R.id.virtualpump_reservoir);
|
||||
pumpTypeView = (TextView) view.findViewById(R.id.virtualpump_type);
|
||||
pumpSettingsView = (TextView) view.findViewById(R.id.virtualpump_type_def);
|
||||
|
||||
return view;
|
||||
} catch (Exception e) {
|
||||
|
|
@ -93,6 +99,20 @@ public class VirtualPumpFragment extends SubscriberFragment {
|
|||
}
|
||||
batteryView.setText(virtualPump.batteryPercent + "%");
|
||||
reservoirView.setText(virtualPump.reservoirInUnits + "U");
|
||||
|
||||
virtualPump.refreshConfiguration();
|
||||
|
||||
PumpType pumpType = virtualPump.getPumpType();
|
||||
|
||||
pumpTypeView.setText(pumpType.getDescription());
|
||||
|
||||
String template = MainApp.gs(R.string.virtualpump_pump_def);
|
||||
|
||||
template = template.replace("EXTENDED_NOTE", pumpType.hasExtendedBasals() ? //
|
||||
MainApp.gs(R.string.virtualpump_pump_def_extended_note) : "");
|
||||
|
||||
pumpSettingsView.setText(pumpType.getFullDescription(template));
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ import info.nightscout.androidaps.interfaces.TreatmentsInterface;
|
|||
import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
|
||||
import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
|
||||
import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.defs.PumpType;
|
||||
import info.nightscout.androidaps.plugins.PumpCommon.utils.PumpUtil;
|
||||
import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
|
||||
import info.nightscout.utils.DateUtil;
|
||||
import info.nightscout.utils.NSUpload;
|
||||
|
|
@ -51,6 +53,9 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
|
|||
|
||||
private PumpDescription pumpDescription = new PumpDescription();
|
||||
|
||||
PumpType pumpType = null;
|
||||
|
||||
|
||||
private static void loadFakingStatus() {
|
||||
fromNSAreCommingFakedExtendedBoluses = SP.getBoolean("fromNSAreCommingFakedExtendedBoluses", false);
|
||||
}
|
||||
|
|
@ -460,4 +465,28 @@ public class VirtualPumpPlugin implements PluginBase, PumpInterface {
|
|||
return "Virtual Pump";
|
||||
}
|
||||
|
||||
public PumpType getPumpType()
|
||||
{
|
||||
return pumpType;
|
||||
}
|
||||
|
||||
|
||||
public void refreshConfiguration()
|
||||
{
|
||||
String pumptype = SP.getString("virtualpump_type", "Generic AAPS");
|
||||
|
||||
PumpType pumpTypeNew = PumpType.getByDescription(pumptype);
|
||||
|
||||
if (pumpType == pumpTypeNew)
|
||||
return;
|
||||
|
||||
// reset
|
||||
pumpDescription.resetSettings();
|
||||
|
||||
PumpUtil.setPumpDescription(pumpDescription, pumpTypeNew, true);
|
||||
|
||||
this.pumpType = pumpTypeNew;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Reservoir -->
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="2dip"
|
||||
|
|
@ -232,6 +233,99 @@
|
|||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Pump Type -->
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="2dip"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/listdelimiter" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="end"
|
||||
android:paddingRight="5dp"
|
||||
android:text="@string/virtualpump_type"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="5dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="2dp"
|
||||
android:text=":"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/virtualpump_type"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Pump Type -->
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="2dip"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@color/listdelimiter" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="end"
|
||||
android:paddingRight="5dp"
|
||||
android:text="@string/virtualpump_definition"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="5dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="2dp"
|
||||
android:text=":"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/virtualpump_type_def"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingLeft="5dp"
|
||||
android:textSize="14sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
|
|
|
|||
|
|
@ -100,8 +100,32 @@
|
|||
<item>@string/yes</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="virtualPumpTypes">
|
||||
<item>Generic AAPS</item>
|
||||
<item>Cellnovo</item>
|
||||
<item>Accu-Chek Spirit</item>
|
||||
<item>Accu-Chek Combo</item>
|
||||
<item>Animas Ping</item>
|
||||
<item>Animas Vibe</item>
|
||||
<item>DanaR</item>
|
||||
<item>DanaR Korean</item>
|
||||
<item>DanaRS</item>
|
||||
<item>DanaRv2</item>
|
||||
<item>Insulet Omnipod</item>
|
||||
<item>Medtronic 512/712</item>
|
||||
<item>Medtronic 515/715</item>
|
||||
<item>Medtronic 522/722</item>
|
||||
<item>Medtronic 523/723</item>
|
||||
<item>Medtronic 553/753 (Revel)</item>
|
||||
<item>Medtronic 554/754 (Veo)</item>
|
||||
<item>Medtronic 640G</item>
|
||||
<item>Tandem t:slim</item>
|
||||
<item>Tandem t:flex</item>
|
||||
<item>Tandem t:slim G4</item>
|
||||
<item>Tandem t:slim X2</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="medtronicPumpTypeArray">
|
||||
<string-array name="medtronicPumpTypeArray">
|
||||
<item>Other (unsupported)</item>
|
||||
<item>512</item>
|
||||
<item>712</item>
|
||||
|
|
@ -122,4 +146,5 @@
|
|||
<item>EU</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -861,6 +861,10 @@
|
|||
<string name="combo_error_bolus_recovery_progress">Recovering from connection loss</string>
|
||||
<string name="combo_reservoir_level_insufficient_for_bolus">Not enough insulin for bolus left in reservoir</string>
|
||||
<string name="extendedbolusdeliveryerror">Extended bolus delivery error</string>
|
||||
<string name="virtualpump_type">Virtual Pump Type</string>
|
||||
<string name="virtualpump_definition">Pump Definition</string>
|
||||
<string name="virtualpump_pump_def">Bolus: Step=%s\nExtended Bolus: [Step=%s, Duration=%smin-%sh]\nBasal: Step=%s\nTBR: %s (by %s), Duration=%smin-%sh\nEXTENDED_NOTE</string>
|
||||
<string name="virtualpump_pump_def_extended_note">* Ranged basal/bolus values are not supported by Virtual Pump.</string>
|
||||
|
||||
<!-- Pump Abstract -->
|
||||
<string name="pump_operation_not_supported_by_pump">Operation not supported by pump.</string>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,14 @@
|
|||
android:defaultValue="false"
|
||||
android:key="virtualpump_uploadstatus"
|
||||
android:title="@string/virtualpump_uploadstatus_title" />
|
||||
|
||||
<ListPreference
|
||||
android:defaultValue="1"
|
||||
android:entries="@array/virtualPumpTypes"
|
||||
android:entryValues="@array/virtualPumpTypes"
|
||||
android:key="virtualpump_type"
|
||||
android:title="@string/virtualpump_type" />
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
</PreferenceScreen>
|
||||
Loading…
Reference in a new issue