From 8ab301ed6f74bb46dadad226233e70beba10f49d Mon Sep 17 00:00:00 2001 From: James Woglom Date: Sat, 17 Oct 2026 23:40:34 -0400 Subject: [PATCH] Bump pumpX2 to v1.9.3 Fixes wrong decoding of some history records (type 277). BolusType was re-mapped in the library: EXTENDED is now LATER, FOOD1 is now NOW (same mask value 1). Co-Authored-By: Claude Sonnet 5.5 --- gradle/libs.versions.toml | 2 +- .../app/aaps/pump/tandem/common/comm/TandemDataConverter.kt | 2 +- .../pump/tandem/common/driver/connector/TandemPumpConnector.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2154e7153e72..90ba36e8a8ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -247,7 +247,7 @@ jetbrains-compose-material-icons-extended = { module = "org.jetbrains.compose.ma com-jakewharton-timber = { group = "com.jakewharton.timber", name = "timber", version="5.0.1" } com-github-weliem-blessed-android = { group = "com.github.weliem", name = "blessed-android", version="2.4.0" } io-github-vanpra-compose-dialogs-datetime = { group = "io.github.vanpra.compose-material-dialogs", name = "datetime", version="0.9.0" } -com-github-jwoglom-pumpx2-android = { group = "com.github.jwoglom.pumpX2", name = "pumpx2-android", version="v1.9.1" } +com-github-jwoglom-pumpx2-android = { group = "com.github.jwoglom.pumpX2", name = "pumpx2-android", version="v1.9.3" } androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" } diff --git a/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/comm/TandemDataConverter.kt b/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/comm/TandemDataConverter.kt index b75fc71c55d6..05441668afc9 100644 --- a/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/comm/TandemDataConverter.kt +++ b/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/comm/TandemDataConverter.kt @@ -60,7 +60,7 @@ class TandemDataConverter( val bolusTypes = message.bolusType - val bolusType: BolusType = if (bolusTypes.contains(element = BolusDeliveryHistoryLog.BolusType.EXTENDED)) { + val bolusType: BolusType = if (bolusTypes.contains(element = BolusDeliveryHistoryLog.BolusType.LATER)) { BolusType.EXTENDED } else { BolusType.NORMAL diff --git a/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/driver/connector/TandemPumpConnector.kt b/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/driver/connector/TandemPumpConnector.kt index 41a4ce572145..37a03a8e091c 100644 --- a/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/driver/connector/TandemPumpConnector.kt +++ b/pump/tandem/src/main/kotlin/app/aaps/pump/tandem/common/driver/connector/TandemPumpConnector.kt @@ -445,7 +445,7 @@ class TandemPumpConnector(var tandemPumpStatus: TandemPumpStatus, val bolusCarbs = 0 val bolusRequest = InitiateBolusRequest(volume, permissionResponseMessage.bolusId, - BolusDeliveryHistoryLog.BolusType.FOOD1.mask(), + BolusDeliveryHistoryLog.BolusType.NOW.mask(), // NOW = 1, same value as old FOOD1 0, 0, bolusCarbs, 0, 0)