From 5131b8b62f289819f8a5f64ed4c72647fa6296b7 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Tue, 17 Oct 2017 12:20:48 +0200 Subject: [PATCH] Remove combo hacks outside of combo plugin. --- .../androidaps/PreferencesActivity.java | 2 +- .../androidaps/db/TemporaryBasal.java | 7 ------ .../ConfigBuilder/ConfigBuilderPlugin.java | 5 +--- .../androidaps/plugins/Loop/LoopPlugin.java | 2 +- .../plugins/PumpDanaR/DanaRPlugin.java | 25 +++++++++++-------- .../plugins/Treatments/TreatmentsPlugin.java | 4 +-- .../plugins/Wear/ActionStringHandler.java | 2 +- app/src/main/res/values/strings.xml | 13 +++------- 8 files changed, 24 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java index 7163cdc6e0..dcd517daa8 100644 --- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java +++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java @@ -152,7 +152,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre } } if (Config.COMBO) { - ComboPlugin comboPlugin = (ComboPlugin) MainApp.getSpecificPlugin(ComboPlugin.class); + ComboPlugin comboPlugin = MainApp.getSpecificPlugin(ComboPlugin.class); if (comboPlugin.isEnabled(PluginBase.PUMP)) { addPreferencesFromResource(R.xml.pref_combo); } diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java index 9edffe15bc..3c8f95f5af 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java +++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java @@ -252,11 +252,6 @@ public class TemporaryBasal implements Interval { return Math.round(msecs / 60f / 1000); } - public int getPlannedRemainingSeconds() { - Float remainingMin = (end() - System.currentTimeMillis()) / 1000f; - return remainingMin.intValue(); - } - public int getPlannedRemainingMinutes() { float remainingMin = (end() - System.currentTimeMillis()) / 1000f / 60; return (remainingMin < 0) ? 0 : Math.round(remainingMin); @@ -285,8 +280,6 @@ public class TemporaryBasal implements Interval { ", isAbsolute=" + isAbsolute + ", isFakeExtended=" + isFakeExtended + ", netExtendedRate=" + netExtendedRate + - ", minutesRemaining=" + getPlannedRemainingMinutes() + - ", secondsRemaining=" + getPlannedRemainingSeconds() + '}'; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java index c6f3ca0e5a..b60ab20d88 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java @@ -582,10 +582,7 @@ public class ConfigBuilderPlugin implements PluginBase, PumpInterface, Constrain result.comment = "Temp basal set correctly"; result.success = true; if (Config.logCongigBuilderActions) - log.debug("applyAPSRequest: Temp basal set correctly " - + "(no pump request needed, pump is still running requested rate of " - + request.rate + " for " - + (int) getTempBasalRemainingMinutesFromHistory() + " more minutes)"); + log.debug("applyAPSRequest: Temp basal set correctly"); } else { if (Config.logCongigBuilderActions) log.debug("applyAPSRequest: setTempBasalAbsolute()"); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java index bd0c5d2c3e..f1fc88625e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java @@ -266,7 +266,7 @@ public class LoopPlugin implements PluginBase { return; } - // check rate for constraints + // check rate for constrais final APSResult resultAfterConstraints = result.clone(); resultAfterConstraints.rate = constraintsInterface.applyBasalConstraints(resultAfterConstraints.rate); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java index eee89b4f2b..65dd5192e4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.squareup.otto.Subscribe; @@ -67,7 +66,6 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C private static DanaRExecutionService sExecutionService; - @NonNull private static DanaRPump pump = DanaRPump.getInstance(); private static boolean useExtendedBoluses = false; @@ -761,17 +759,21 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C return true; } + @SuppressWarnings("PointlessBooleanExpression") @Override public Double applyBasalConstraints(Double absoluteRate) { double origAbsoluteRate = absoluteRate; - if (absoluteRate > pump.maxBasal) { - absoluteRate = pump.maxBasal; - if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit) - log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h"); + if (pump != null) { + if (absoluteRate > pump.maxBasal) { + absoluteRate = pump.maxBasal; + if (Config.logConstraintsChanges && origAbsoluteRate != Constants.basalAbsoluteOnlyForCheckLimit) + log.debug("Limiting rate " + origAbsoluteRate + "U/h by pump constraint to " + absoluteRate + "U/h"); + } } return absoluteRate; } + @SuppressWarnings("PointlessBooleanExpression") @Override public Integer applyBasalConstraints(Integer percentRate) { Integer origPercentRate = percentRate; @@ -783,13 +785,16 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C return percentRate; } + @SuppressWarnings("PointlessBooleanExpression") @Override public Double applyBolusConstraints(Double insulin) { double origInsulin = insulin; - if (insulin > pump.maxBolus) { - insulin = pump.maxBolus; - if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit) - log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U"); + if (pump != null) { + if (insulin > pump.maxBolus) { + insulin = pump.maxBolus; + if (Config.logConstraintsChanges && origInsulin != Constants.bolusOnlyForCheckLimit) + log.debug("Limiting bolus " + origInsulin + "U by pump constraint to " + insulin + "U"); + } } return insulin; } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java index 8c9da3f643..6422ec3589 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java @@ -283,9 +283,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { @Override public boolean isTempBasalInProgress() { - TemporaryBasal tempBasalFromHistory = getTempBasalFromHistory(System.currentTimeMillis()); - log.debug("activeTempbasal: " + tempBasalFromHistory); - return tempBasalFromHistory != null && tempBasalFromHistory.getPlannedRemainingSeconds() > 60; + return getTempBasalFromHistory(System.currentTimeMillis()) != null; } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java index ee816c647a..9fbcc31685 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java @@ -441,7 +441,7 @@ public class ActionStringHandler { ret += "OPEN LOOP\n"; } final APSInterface aps = MainApp.getConfigBuilder().getActiveAPS(); - ret += "APS: " + ((aps == null) ? R.string.noapsselected : ((PluginBase) aps).getName()); + ret += "APS: " + ((aps == null) ? "NO APS SELECTED!" : ((PluginBase) aps).getName()); if (activeloop.lastRun != null) { if (activeloop.lastRun.lastAPSRun != null) ret += "\nLast Run: " + DateUtil.timeString(activeloop.lastRun.lastAPSRun); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 61910f9808..68b8e17aec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -751,23 +751,18 @@ Connection timed out Stopping bolus delivery Bolus delivery stopped - combo_enable_experimental_features + combo_enable_experimental_features Enable experimental features Unlocks experimental features which are in development and might be broken entirely. - combo_experimental_split_bolus + combo_experimental_split_bolus Experimental split bolus feature Splits boluses into 2 U parts and waits around 45s after each to slow down bolus delivery (only active with non-experimental bolus). - combo_experimental_reject_tbr_changes_below_delta + combo_experimental_reject_tbr_changes_below_delta Skip TBR changes below threshold (%). Don\'t set a TBR if the difference between the new and a running TBR is below this threshold in percent. Specifying 0 disables this option. - combo_disable_alerts + combo_disable_alerts Disable alerts Ignore all errors encountered while communicating with the pump. Alerts raised by the pump (including those caused by AAPS) will still be raised. Programming pump for bolusing - wizard_include_bg - wizard_include_cob - wizard_include_trend_bg - wizard_include_bolus_iob - wizard_include_basal_iob