caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2647 from dv1/combov2-fixes-001

Browse source 
combov2: Set the bolusDelivered value when a bolus delivery is finished
This commit is contained in:
Milos Kozak 2023-08-04 10:29:53 +02:00 committed by GitHub
parent a195fce692 d85fd9e8fe
commit bf97c405d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt
View file

@ -1102,7 +1102,17 @@ class ComboV2Plugin @Inject constructor (
reportFinishedBolus(R.string.combov2_bolus_delivery_failed, pumpEnactResult, succeeded = false)
} finally {
// The delivery was enacted if even a partial amount was infused.
pumpEnactResult.enacted = acquiredPump.lastBolusFlow.value?.let { it.bolusAmount > 0 } ?: false
acquiredPump.lastBolusFlow.value?.also {
pumpEnactResult.enacted = (it.bolusAmount > 0)
pumpEnactResult.bolusDelivered = it.bolusAmount.cctlBolusToIU()
} ?: run {
pumpEnactResult.enacted = false
pumpEnactResult.bolusDelivered = 0.0
}
aapsLogger.debug(
LTag.PUMP,
"Pump enact result: success ${pumpEnactResult.success} enacted ${pumpEnactResult.enacted} bolusDelivered ${pumpEnactResult.bolusDelivered}"
)
bolusJob = null
bolusProgressJob.cancelAndJoin()
}