From 34103931f59c174ad462e3e96151b7b0505adf62 Mon Sep 17 00:00:00 2001 From: Andrei Vereha Date: Thu, 3 Jun 2021 22:00:42 +0200 Subject: [PATCH 1/2] add comment --- .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index d6d128a7cb..99133748f3 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -395,6 +395,7 @@ class OmnipodDashPumpPlugin @Inject constructor( OmnipodCommandType.SET_TEMPORARY_BASAL -> // This treatment was synced before sending the command if (!confirmation.success) { + // TODO: the ID here is the temp basal id, not the pumpId!! pumpSync.invalidateTemporaryBasal(historyEntry.pumpId()) } From 3dc47816925265f50588d8bc52b229fda2d68b6a Mon Sep 17 00:00:00 2001 From: Andrei Vereha Date: Thu, 3 Jun 2021 22:15:26 +0200 Subject: [PATCH 2/2] use delivery status for checking if there is a tempbasal to cancel --- .../plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt | 6 +++--- .../dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index 99133748f3..62d9d3748d 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -307,7 +307,7 @@ class OmnipodDashPumpPlugin @Inject constructor( return ret } - private fun observeNoActiveTempBasal(enforeNew: Boolean): Completable { + private fun observeNoActiveTempBasal(enforceNew: Boolean): Completable { return Completable.defer { val expectedState = pumpSync.expectedPumpState() when { @@ -315,7 +315,7 @@ class OmnipodDashPumpPlugin @Inject constructor( aapsLogger.info(LTag.PUMP, "No temporary basal to cancel") Completable.complete() } - !enforeNew -> + !enforceNew -> Completable.error( IllegalStateException( "Temporary basal already active and enforeNew is not set." @@ -335,7 +335,7 @@ class OmnipodDashPumpPlugin @Inject constructor( private fun observeActiveTempBasal(): Completable { return Completable.defer { - if (pumpSync.expectedPumpState().temporaryBasal != null) + if (podStateManager.tempBasalActive) Completable.complete() else Completable.error( diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt index f100620760..b84cf5eb13 100644 --- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt +++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt @@ -148,7 +148,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor( get() = podState.tempBasal override val tempBasalActive: Boolean - get() = tempBasal != null && tempBasal!!.startTime + tempBasal!!.durationInMinutes * 60 * 1000 > System.currentTimeMillis() + get() = podState.deliveryStatus in arrayOf(DeliveryStatus.TEMP_BASAL_ACTIVE, DeliveryStatus.BOLUS_AND_TEMP_BASAL_ACTIVE) override var basalProgram: BasalProgram? get() = podState.basalProgram