caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Update pump profile during Combo init.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-23 11:13:47 +01:00
parent 90611a1792
commit 28f31414ba
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI; import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI;
import info.nightscout.utils.DateUtil; import info.nightscout.utils.DateUtil;
import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.DecimalFormatter;
import info.nightscout.utils.SP;
import static de.jotomo.ruffy.spi.BolusProgressReporter.State.FINISHED; import static de.jotomo.ruffy.spi.BolusProgressReporter.State.FINISHED;
@ -263,10 +264,12 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
@Override @Override
public boolean isThisProfileSet(Profile profile) { public boolean isThisProfileSet(Profile profile) {
if (!isInitialized()) if (!isInitialized()) {
return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS // This is called too soon (for the Combo) on startup, so ignore this.
if (pump.basalProfile == null) // The Combo init (refreshDataFromPump) will read the profile and update the pump's
return true; // TODO: not sure what's better. so far TRUE to prevent too many SMS // profile if the pref is set;
return true;
}
return pump.basalProfile.equals(convertProfileToComboProfile(profile)); return pump.basalProfile.equals(convertProfileToComboProfile(profile));
} }
@ -341,6 +344,12 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
return; return;
} }
pump.basalProfile = readBasalResult.basalProfile; pump.basalProfile = readBasalResult.basalProfile;
Profile profile = MainApp.getConfigBuilder().getProfile();
if (SP.getBoolean("syncprofiletopump", false)
&& !pump.basalProfile.equals(convertProfileToComboProfile(profile))) {
setNewBasalProfile(profile);
}
} }
if (!checkPumpHistory()) { if (!checkPumpHistory()) {