caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

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

Browse source 
comboctl-main: Use the standard bolus' total amount as its immediate amount
This commit is contained in:
Milos Kozak 2023-02-09 21:01:04 +01:00 committed by GitHub
commit ea7ccfc8f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1533,11 +1533,26 @@ class Pump(
pumpMode = null,
isIdempotent = false,
description = DeliveringBolusCommandDesc(
totalBolusAmount,
immediateBolusAmount,
durationInMinutes,
standardBolusReason,
bolusType
totalBolusAmount = totalBolusAmount,
// A standard bolus only has an immediate portion, no extended one. This
// implies that its total amount is also its immediate amount. As the
// function documentation states, the user only species the total amount
// when delivering a standard bolus - the immediateBolusAmount argument
// of deliverBolus() is ignored. It makes no sense for users to have
// to specify the same value twice.
//
// For UI elements it is however useful to have immediateBolusAmount be
// automatically set to the totalBolusAmount when delivering a standard
// bolus. One example for why this is useful is when during the immediate
// portion of a bolus, a modal dialog is shown with a progress bar, while
// the extended portion shows no such dialog.
//
// For this reason, assign the totalBolusAmount quantity to the
// immediateBolusAmount field of the command desc if this is a standard bolus.
immediateBolusAmount = if (bolusType == CMDDeliverBolusType.STANDARD_BOLUS) totalBolusAmount else immediateBolusAmount,
durationInMinutes = durationInMinutes,
standardBolusReason = standardBolusReason,
bolusType = bolusType
)
) {
require((totalBolusAmount > 0) && (totalBolusAmount <= 250)) {