caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dash' into avereha/basal

Browse source
This commit is contained in:
Andrei Vereha 2021-06-06 21:28:23 +02:00
parent ffe3246fc0 9036544516
commit 697e646854
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
View file

@ -302,7 +302,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
.filter { podEvent -> podEvent is PodEvent.CommandSent } .filter { podEvent -> podEvent is PodEvent.CommandSent }
.map { pumpSyncTempBasal(it, absoluteRate, durationInMinutes.toLong(), tbrType) } .map { pumpSyncTempBasal(it, absoluteRate, durationInMinutes.toLong(), tbrType) }
.ignoreElements(), .ignoreElements(),
pre = observeNoActiveTempBasal(enforceNew) pre = observeNoActiveTempBasal()
).toPumpEnactResult() ).toPumpEnactResult()
} }
@ -336,31 +336,19 @@ class OmnipodDashPumpPlugin @Inject constructor(
return ret return ret
} }
private fun observeNoActiveTempBasal(enforceNew: Boolean): Completable { private fun observeNoActiveTempBasal(): Completable {
return Completable.defer { return Completable.defer {
when { val expectedState = pumpSync.expectedPumpState()
podStateManager.deliveryStatus !in if (expectedState.temporaryBasal == null) {
arrayOf(DeliveryStatus.TEMP_BASAL_ACTIVE, DeliveryStatus.BOLUS_AND_TEMP_BASAL_ACTIVE) -> { aapsLogger.info(LTag.PUMP, "No temporary basal to cancel")
// TODO: what happens if we try to cancel inexistent temp basal? Completable.complete()
aapsLogger.info(LTag.PUMP, "No temporary basal to cancel") } else {
Completable.complete() // enforceNew == true
} aapsLogger.info(LTag.PUMP, "Canceling existing temp basal")
executeSimpleProgrammingCommand(
!enforceNew -> history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
Completable.error( omnipodManager.stopTempBasal().ignoreElements()
IllegalStateException( )
"Temporary basal already active and enforeNew is not set."
)
)
else -> {
// enforceNew == true
aapsLogger.info(LTag.PUMP, "Canceling existing temp basal")
executeSimpleProgrammingCommand(
history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
omnipodManager.stopTempBasal().ignoreElements()
)
}
} }
} }
} }