caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/dev' into ns15

Browse source
This commit is contained in:
Milos Kozak 2023-02-10 22:00:49 +01:00
commit c6ec76488e
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
rxkotlin_version = '3.0.1' rxkotlin_version = '3.0.1'
room_version = '2.5.0' room_version = '2.5.0'
lifecycle_version = '2.5.1' lifecycle_version = '2.5.1'
dagger_version = '2.44.2' dagger_version = '2.45'
coroutines_version = '1.6.4' coroutines_version = '1.6.4'
activity_version = '1.6.1' activity_version = '1.6.1'
fragmentktx_version = '1.5.5' fragmentktx_version = '1.5.5'

2
core/utils/build.gradle
View file

@ -22,7 +22,7 @@ dependencies {
implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared')
//Firebase //Firebase
api platform('com.google.firebase:firebase-bom:31.2.0') api platform('com.google.firebase:firebase-bom:31.2.1')
api "com.google.firebase:firebase-analytics-ktx" api "com.google.firebase:firebase-analytics-ktx"
api "com.google.firebase:firebase-crashlytics-ktx" api "com.google.firebase:firebase-crashlytics-ktx"
// StatsActivity not in use now // StatsActivity not in use now

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

@ -1533,11 +1533,26 @@ class Pump(
pumpMode = null, pumpMode = null,
isIdempotent = false, isIdempotent = false,
description = DeliveringBolusCommandDesc( description = DeliveringBolusCommandDesc(
totalBolusAmount, totalBolusAmount = totalBolusAmount,
immediateBolusAmount, // A standard bolus only has an immediate portion, no extended one. This
durationInMinutes, // implies that its total amount is also its immediate amount. As the
standardBolusReason, // function documentation states, the user only species the total amount
bolusType // 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)) { require((totalBolusAmount > 0) && (totalBolusAmount <= 250)) {