caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Check pump basal rate matches cached profile, force re-read otherwise.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-01-28 23:24:32 +01:00
parent 9f5ffc6646
commit 262fdf92c8
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -819,11 +819,40 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
checkForUnsafeUsage(preCheckResult);
checkAndResolveTbrMismatch(preCheckResult.state);
checkPumpTime(preCheckResult.state);
checkBasalRate(preCheckResult.state);
checkHistory();
return null;
}
private void checkBasalRate(PumpState state) {
if (!pump.initialized) {
// no cached profile to compare against
return;
}
if (state.tbrActive && state.tbrPercent == 0) {
// can't infer base basal rate if TBR is 0
return;
}
double pumpBasalRate = state.tbrActive
? state.basalRate * 100 / state.tbrPercent
: state.basalRate;
int pumpHour = new Date(state.pumpTime).getHours();
int phoneHour = new Date().getHours();
if (pumpHour != phoneHour) {
// only check if clocks are close
return;
}
if (pumpBasalRate != getBaseBasalRate()) {
CommandResult readBasalResult = runCommand(MainApp.gs(R.string.combo_actvity_reading_basal_profile), 2, ruffyScripter::readBasalProfile);
if (readBasalResult.success) {
pump.basalProfile = readBasalResult.basalProfile;
}
}
}
/** Check pump time (on the main menu) and raise notification if time is off.
* (setting clock is not supported by ruffy) */
private void checkPumpTime(PumpState state) {
@ -1082,7 +1111,7 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
extendedJson.put("ActiveProfile", MainApp.getConfigBuilder().getProfileName());
PumpState ps = pump.state;
if (ps.tbrActive) {
extendedJson.put("TempBasalAbsoluteRate", ps.tbrRate);
extendedJson.put("TempBasalAbsoluteRate", ps.basalRate);
extendedJson.put("TempBasalPercent", ps.tbrPercent);
extendedJson.put("TempBasalRemaining", ps.tbrRemainingDuration);
}

10
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java
View file

@ -13,8 +13,8 @@ public class PumpState {
public boolean tbrActive = false;
/** TBR percentage. 100% means no TBR active, just the normal basal rate running. */
public int tbrPercent = -1;
/** The absolute rate the TBR is running, e.g. 0.80U/h. */
public double tbrRate = -1;
/** The absolute rate the pump is running (regular basal rate or TBR), e.g. 0.80U/h. */
public double basalRate = -1;
/** Remaining time of an active TBR. Note that 0:01 is te lowest displayed, the pump
* jumps from that to TBR end, skipping 0:00(xx). */
public int tbrRemainingDuration = -1;
@ -52,8 +52,8 @@ public class PumpState {
return this;
}
public PumpState tbrRate(double tbrRate) {
this.tbrRate = tbrRate;
public PumpState basalRate(double basalRate) {
this.basalRate = basalRate;
return this;
}
@ -91,7 +91,7 @@ public class PumpState {
", suspended=" + suspended +
", tbrActive=" + tbrActive +
", tbrPercent=" + tbrPercent +
", tbrRate=" + tbrRate +
", basalRate=" + basalRate +
", tbrRemainingDuration=" + tbrRemainingDuration +
", activeAlert=" + activeAlert +
", batteryState=" + batteryState +

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java
View file

@ -520,7 +520,7 @@ public class RuffyScripter implements RuffyCommands {
state.tbrPercent = displayedTbr.intValue();
MenuTime durationMenuTime = ((MenuTime) menu.getAttribute(MenuAttribute.RUNTIME));
state.tbrRemainingDuration = durationMenuTime.getHour() * 60 + durationMenuTime.getMinute();
state.tbrRate = ((double) menu.getAttribute(MenuAttribute.BASAL_RATE));
state.basalRate = ((double) menu.getAttribute(MenuAttribute.BASAL_RATE));
}
if (menu.attributes().contains(MenuAttribute.BATTERY_STATE)) {
state.batteryState = ((int) menu.getAttribute(MenuAttribute.BATTERY_STATE));