caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2631 from jbr7rr/fix-pump-disconnect-alarms

Browse source 
Fix pump disconnect alarms
This commit is contained in:
Milos Kozak 2023-07-20 14:46:46 +02:00 committed by GitHub
commit a25da53e5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveWorker.kt
View file

@ -191,7 +191,10 @@ class KeepAliveWorker(
} }
if (loop.isDisconnected) { if (loop.isDisconnected) {
// do nothing if pump is disconnected // do nothing if pump is disconnected
} else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile) || (runningProfile is ProfileSealed.EPS && runningProfile.value.originalEnd < dateUtil.now())) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE))) { } else if (runningProfile == null || ((!pump.isThisProfileSet(requestedProfile) || !requestedProfile.isEqual(runningProfile)
|| (runningProfile is ProfileSealed.EPS && runningProfile.value.originalEnd < dateUtil.now() && runningProfile.value.originalDuration != 0L))
&& !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)))
{
rxBus.send(EventProfileSwitchChanged()) rxBus.send(EventProfileSwitchChanged())
} else if (isStatusOutdated && !pump.isBusy()) { } else if (isStatusOutdated && !pump.isBusy()) {
lastReadStatus = now lastReadStatus = now