caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Check in files forgotten in previous commit

Browse source
This commit is contained in:
Bart Sopers 2020-08-25 14:00:04 +02:00
parent dc7ed96657
commit 2fdbbd9057
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/info/nightscout/androidaps/queue/commands/CommandStartPump.kt
View file

@ -2,7 +2,9 @@ package info.nightscout.androidaps.queue.commands
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.androidaps.interfaces.ActivePluginProvider import info.nightscout.androidaps.interfaces.ActivePluginProvider
import info.nightscout.androidaps.interfaces.ProfileFunction
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.queue.Callback
import javax.inject.Inject import javax.inject.Inject
@ -12,12 +14,19 @@ class CommandStartPump(
) : Command(injector, CommandType.START_PUMP, callback) { ) : Command(injector, CommandType.START_PUMP, callback) {
@Inject lateinit var activePlugin: ActivePluginProvider @Inject lateinit var activePlugin: ActivePluginProvider
@Inject lateinit var profileFunction: ProfileFunction
override fun execute() { override fun execute() {
val pump = activePlugin.activePump val pump = activePlugin.activePump
if (pump is LocalInsightPlugin) { if (pump is LocalInsightPlugin) {
val result = pump.startPump() val result = pump.startPump()
callback?.result(result)?.run() callback?.result(result)?.run()
} else if (pump is OmnipodPumpPlugin) {
// When using CommandQueue.setProfile, it refuses to set the profile is the same as the current profile
// However we need to set the current profile to resume delivery in case the Pod is suspended
if (profileFunction.getProfile() != null) {
pump.setNewBasalProfile(profileFunction.getProfile())
}
} }
} }

1
core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.java
View file

@ -72,6 +72,7 @@ public class Notification {
public static final int OMNIPOD_POD_NOT_ATTACHED = 59; public static final int OMNIPOD_POD_NOT_ATTACHED = 59;
public static final int CARBS_REQUIRED = 60; public static final int CARBS_REQUIRED = 60;
public static final int IMPORTANCE_HIGH = 2; public static final int IMPORTANCE_HIGH = 2;
public static final int OMNIPOD_POD_SUSPENDED = 61;
public static final String CATEGORY_ALARM = "alarm"; public static final String CATEGORY_ALARM = "alarm";