From 7a95adca299568ccf798293908a1ca7cf7a5a022 Mon Sep 17 00:00:00 2001 From: Tim Gunn Date: Sat, 27 Oct 2018 12:33:32 +1300 Subject: [PATCH] Find Bolus incrument on pump, make sure the pump can support the minSMB bolus setting --- .../plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java index ffa1954bad..e307156223 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSSMB/DetermineBasalAdapterSMBJS.java @@ -25,6 +25,7 @@ import info.nightscout.androidaps.data.IobTotal; import info.nightscout.androidaps.data.MealData; import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.db.TemporaryBasal; +import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.logging.L; import info.nightscout.androidaps.plugins.IobCobCalculator.IobCobCalculatorPlugin; import info.nightscout.androidaps.plugins.Loop.ScriptReader; @@ -215,7 +216,8 @@ public class DetermineBasalAdapterSMBJS { ) throws JSONException { String units = profile.getUnits(); - + Double bolusincrument = SP.getDouble("key_bolus_increment", SMBDefaults.bolus_increment); + Double pumpbolusstep = MainApp.getConfigBuilder().getActivePump().getPumpDescription().bolusStep; mProfile = new JSONObject(); mProfile.put("max_iob", maxIob); @@ -256,7 +258,11 @@ public class DetermineBasalAdapterSMBJS { mProfile.put("enableSMB_after_carbs", SP.getBoolean(R.string.key_enableSMB_after_carbs, false) && advancedFiltering); mProfile.put("maxSMBBasalMinutes", SP.getInt("key_smbmaxminutes", SMBDefaults.maxSMBBasalMinutes)); mProfile.put("maxUAMSMBBasalMinutes", SP.getInt("key_uamsmbmaxminutes", SMBDefaults.maxUAMSMBBasalMinutes)); - mProfile.put("bolus_increment", SP.getDouble("key_bolus_increment", SMBDefaults.bolus_increment)); + if (bolusincrument < pumpbolusstep){ + //the bolus incrument is less than what the pump can support (by pump settings or pump restriction), set to value supported by the pump + bolusincrument = pumpbolusstep; + } + mProfile.put("bolus_increment", bolusincrument); mProfile.put("carbsReqThreshold", SMBDefaults.carbsReqThreshold); mProfile.put("current_basal", basalrate);