caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

comboctl-main: Correctly handle alerts after bolus was delivered

Browse source 
In particular, if a bolus brings the reservoir level below the low
threshold, a W1 warning shows up on the pump itself during bolus delivery.
Once delivery is done, the W1 shows up in the RT mode as well. Bolus
delivery is special in that the deliverBolus() function has to manually
switch back to RT mode to get the reservoir level post-bolus to update
the reservoirLevel value. When that is done, the aforementioned alert
screen can show up. Add code to handle alert screen handling to that
special post-bolus check.

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
This commit is contained in:
Carlos Rafael Giani 2022-11-19 13:56:01 +01:00
parent 20d4a0c692
commit d50feec302
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt
View file

@ -1610,12 +1610,31 @@ class Pump(
// We always re-read the pump status, even if the history delta
// checks above detected discrepancies, to make sure the status
// is up-to-date.
pumpIO.switchMode(PumpIO.Mode.REMOTE_TERMINAL)
// Not calling updateStatusImpl(), instead calling this directly.
// That's because updateStatusImpl() calls executeCommand(),
// and here, we already are running in a lambda that's run
// by executeCommand().
updateStatusByReadingMainAndQuickinfoScreens(switchStatesIfNecessary = true)
// This is done in a loop in case an alert screen appears. If the
// alert is a dismissible warning, we dismiss it, and try again
// (hence the loop). In particular, a W1 low reservoir warning
// can show up if the delivered bolus brought the reservoir level
// below the low threshold. W1 is dismissible.
while (true) {
try {
pumpIO.switchMode(PumpIO.Mode.REMOTE_TERMINAL)
// Not calling updateStatusImpl(), instead calling this directly.
// That's because updateStatusImpl() calls executeCommand(),
// and here, we already are running in a lambda that's run
// by executeCommand().
updateStatusByReadingMainAndQuickinfoScreens(switchStatesIfNecessary = true)
break
} catch (e: AlertScreenException) {
logger(LogLevel.DEBUG) { "Got alert screen after bolus" }
// If this is a trivial, purely informative, dismissible
// warning screen, this call dismisses it and also emits
// an event if appropriate (like an event about a low
// reservoir level). If this is a non-dismissible warning
// screen or an error screen, this call itself throws
// an AlertScreenException to propagate the alert further.
handleAlertScreenContent(e.alertScreenContent)
}
}
}
}
}
@ -1897,6 +1916,7 @@ class Pump(
doAlertCheck = true
throw e
} catch (e: AlertScreenException) {
logger(LogLevel.DEBUG) { "Alert occurred during command execution" }
// We enter this catch block if any alert screens appear
// _during_ the command execution. (doAlertCheck is about
// alerts that happen _after_ command execution, like a W6
@ -1960,6 +1980,7 @@ class Pump(
}
} finally {
if (doAlertCheck) {
logger(LogLevel.DEBUG) { "Checking for post-execution alerts" }
// Post-command check in case something went wrong
// and an alert screen appeared after the command ran.
// Most commonly, these are benign warning screens,