From ab900fda6c094d024f13523afd6285e0c5f00167 Mon Sep 17 00:00:00 2001 From: Johannes Mockenhaupt Date: Tue, 31 Oct 2017 14:46:06 +0100 Subject: [PATCH] Refresh tab after pump init. --- .../androidaps/plugins/PumpCombo/ComboPlugin.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 57985122a4..61777b904b 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 @@ -29,6 +29,7 @@ import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.db.Source; import info.nightscout.androidaps.db.TemporaryBasal; import info.nightscout.androidaps.db.Treatment; +import info.nightscout.androidaps.events.EventRefreshOverview; import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.PumpInterface; @@ -230,16 +231,20 @@ public class ComboPlugin implements PluginBase, PumpInterface { return; } } - runCommand("Initializing", 3, () -> ruffyScripter.readHistory(new PumpHistoryRequest())); - pump.initialized = true; } - runCommand("Refreshing", 3, ruffyScripter::readReservoirLevelAndLastBolus); + CommandResult result = runCommand("Refreshing", 3, ruffyScripter::readReservoirLevelAndLastBolus); + if (result.reservoirLevel != PumpState.UNKNOWN) + pump.reservoirLevel = result.reservoirLevel; + pump.state = result.state; + MainApp.bus().post(new EventComboPumpUpdateGUI()); // TODO fuse the below into 'sync'? or make checkForTbrMismatch jut a trigger to issue a sync if needed; don't run sync twice as is nice // checkForTbrMismatch(); // checkPumpHistory(); // checkPumpDate() + + pump.initialized = true; } /**