From 29efe11ece9ffad6928af766c569cb4f656dfd33 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Sun, 13 May 2018 23:04:50 +0200 Subject: [PATCH] Combo: always send out progress updates (SMB or not). Without this, showing SMB progress on wear is broken. (cherry picked from commit 5ebff72) --- .../androidaps/plugins/PumpCombo/ComboPlugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index 3cf4557e54..eb06d4055d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -56,6 +56,7 @@ import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd; +import info.nightscout.androidaps.plugins.Treatments.Treatment; import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin; import info.nightscout.androidaps.queue.Callback; import info.nightscout.androidaps.queue.CommandQueue; @@ -421,9 +422,6 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint return pump.basalProfile.hourlyRates[currentHour]; } - private static BolusProgressReporter nullBolusProgressReporter = (state, percent, delivered) -> { - }; - private static BolusProgressReporter bolusProgressReporter = (state, percent, delivered) -> { EventOverviewBolusProgress event = EventOverviewBolusProgress.getInstance(); switch (state) { @@ -549,12 +547,14 @@ public class ComboPlugin extends PluginBase implements PumpInterface, Constraint return new PumpEnactResult().success(true).enacted(false); } - BolusProgressReporter progressReporter = detailedBolusInfo.isSMB ? nullBolusProgressReporter : bolusProgressReporter; + Treatment treatment = new Treatment(); + treatment.isSMB = detailedBolusInfo.isSMB; + EventOverviewBolusProgress.getInstance().t = treatment; // start bolus delivery scripterIsBolusing = true; runCommand(null, 0, - () -> ruffyScripter.deliverBolus(detailedBolusInfo.insulin, progressReporter)); + () -> ruffyScripter.deliverBolus(detailedBolusInfo.insulin, bolusProgressReporter)); scripterIsBolusing = false; // Note that the result of the issued bolus command is not checked. If there was