implement basals

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

@@ -15,6 +15,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.*
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.OmnipodDashManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEvent
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BasalProgram
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.DeliveryStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodConstants
@@ -136,35 +137,42 @@ class OmnipodDashPumpPlugin @Inject constructor(
     }
 
     override fun getPumpStatus(reason: String) {
-        Observable.concat(
+        val throwable = Completable.concat(listOf(
-            omnipodManager.getStatus(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE),
+            omnipodManager
-            history.updateFromState(podStateManager).toObservable(),
+                .getStatus(ResponseType.StatusResponseType.DEFAULT_STATUS_RESPONSE)
-            podStateManager.updateActiveCommand().toObservable(),
+                .ignoreElements(),
-        ).blockingSubscribeBy(
+            history.updateFromState(podStateManager),
-            onNext = { podEvent ->
+            podStateManager.updateActiveCommand()
-                aapsLogger.debug(
+                .map { handleCommandConfirmation(it) }
-                    LTag.PUMP,
+                .ignoreElement(),
-                    "Received PodEvent in getPumpStatus: $podEvent"
+        )).blockingGet()
-                )
+        if (throwable != null){
-            },
+            aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
-            onError = { throwable ->
+        } else {
-                aapsLogger.error(LTag.PUMP, "Error in getPumpStatus", throwable)
+            aapsLogger.info(LTag.PUMP, "getPumpStatus executed with success")
-            },
+
-            onComplete = {
+        }
-                aapsLogger.debug("getPumpStatus completed")
-            }
-        )
     }
 
     override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        val basalProgram = mapProfileToBasalProgram(profile)
         return executeSimpleProgrammingCommand(
             pre = suspendDeliveryIfActive(),
             historyEntry = history.createRecord(commandType = OmnipodCommandType.SET_BASAL_PROFILE),
-            command = omnipodManager.setBasalProgram(mapProfileToBasalProgram(profile))
+            command = omnipodManager.setBasalProgram(basalProgram).ignoreElements(),
-                .ignoreElements(),
+            basalProgram = basalProgram,
+            post = failWhenUnconfirmed(),
         ).toPumpEnactResult()
     }
 
+    private fun failWhenUnconfirmed(): Completable = Completable.defer{
+        if (podStateManager.activeCommand != null) {
+            Completable.error(java.lang.IllegalStateException("Command not confirmed"))
+        }else {
+            Completable.complete()
+        }
+    }
+
     private fun suspendDeliveryIfActive(): Completable = Completable.defer {
         if (podStateManager.deliveryStatus == DeliveryStatus.SUSPENDED)
             Completable.complete()
@@ -199,8 +207,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
             return true
         }
         // TODO: what do we have to answer here if delivery is suspended?
-        val running = pumpSync.expectedPumpState().profile
+        val running = podStateManager.basalProgram
-        return running?.isEqual(profile) ?: false
+        val equal = (mapProfileToBasalProgram(profile) == running)
+        aapsLogger.info(LTag.PUMP, "isThisProfileSet: $equal")
+        return equal
     }
 
     override fun lastDataTime(): Long {
@@ -615,13 +625,15 @@ class OmnipodDashPumpPlugin @Inject constructor(
         historyEntry: Single<String>,
         command: Completable,
         pre: Completable = Completable.complete(),
+        basalProgram: BasalProgram? = null,
+        post: Completable = Completable.complete(),
     ): Completable {
         return Completable.concat(
             listOf(
                 pre,
                 podStateManager.observeNoActiveCommand().ignoreElements(),
                 historyEntry
-                    .flatMap { podStateManager.createActiveCommand(it) }
+                    .flatMap { podStateManager.createActiveCommand(it, basalProgram) }
                     .ignoreElement(),
                 command.doOnError {
                     podStateManager.activeCommand?.sendError = it
@@ -630,17 +642,18 @@ class OmnipodDashPumpPlugin @Inject constructor(
                 history.updateFromState(podStateManager),
                 podStateManager.updateActiveCommand()
                     .map { handleCommandConfirmation(it) }
-                    .ignoreElement()
+                    .ignoreElement(),
+                post,
             )
         )
     }
 
     private fun handleCommandConfirmation(confirmation: CommandConfirmed) {
-        val historyEntry = history.getById(confirmation.historyId)
+        val command = confirmation.command
+        val historyEntry = history.getById(command.historyId)
         aapsLogger.debug(LTag.PUMPCOMM, "handling command confirmation: $confirmation")
         when (historyEntry.commandType) {
             OmnipodCommandType.CANCEL_TEMPORARY_BASAL,
-            OmnipodCommandType.SET_BASAL_PROFILE,
             OmnipodCommandType.RESUME_DELIVERY ->
                 // We can't invalidate this command,
                 // and this is why it is pumpSync-ed at this point
@@ -653,6 +666,21 @@ class OmnipodDashPumpPlugin @Inject constructor(
                     )
                 }
 
+            OmnipodCommandType.SET_BASAL_PROFILE -> {
+                if (confirmation.success) {
+                    podStateManager.basalProgram = command.basalProgram
+                    if (podStateManager.basalProgram == null) {
+                        aapsLogger.warn(LTag.PUMP, "Saving null basal profile")
+                    }
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                }
+            }
+
             OmnipodCommandType.SET_TEMPORARY_BASAL -> {
                 // This treatment was synced before sending the command
                 aapsLogger.info(LTag.PUMPCOMM, "temporary basal denied. PumpId: ${historyEntry.pumpId()}")

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/BasalProgram.kt

@@ -17,7 +17,16 @@ class BasalProgram(
 
     fun isZeroBasal() = segments.sumBy(Segment::basalRateInHundredthUnitsPerHour) == 0
 
-    fun rateAt(date: Date): Double = 0.0 // TODO
+    fun rateAt(date: Date): Double {
+        val instance = Calendar.getInstance()
+        instance.time = date
+        val hourOfDay = instance[Calendar.HOUR_OF_DAY]
+        val minuteOfHour = instance[Calendar.MINUTE]
+        val slotIndex = hourOfDay * 2 + minuteOfHour.div(30)
+        val slot = segments.find { it.startSlotIndex <= slotIndex && slotIndex< it.endSlotIndex }
+        val ret = (slot?.basalRateInHundredthUnitsPerHour ?: 0).toDouble() / 100
+        return ret
+    }
 
     class Segment(
         val startSlotIndex: Short,

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/CommandConfirmed.kt

@@ -1,3 +1,3 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
 
-data class CommandConfirmed(val historyId: String, val success: Boolean)
+data class CommandConfirmed(val command: OmnipodDashPodStateManager.ActiveCommand, val success: Boolean)

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt

@@ -257,13 +257,13 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
 
             CommandConfirmationDenied -> {
                 podState.activeCommand = null
-                source.onSuccess(CommandConfirmed(activeCommand.historyId, false))
+                source.onSuccess(CommandConfirmed(activeCommand, false))
             }
 
             CommandConfirmationSuccess -> {
                 podState.activeCommand = null
 
-                source.onSuccess(CommandConfirmed(activeCommand.historyId, true))
+                source.onSuccess(CommandConfirmed(activeCommand, true))
             }
 
             NoActiveCommand -> {

omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt

@@ -298,8 +298,15 @@ class OmnipodDashOverviewFragment : DaggerFragment() {
              */
 
             // base basal rate
-            // TODO: check if delivery is suspended
+            podInfoBinding.baseBasalRate.text = if (podStateManager.basalProgram != null && !podStateManager.isSuspended) {
-            podInfoBinding.baseBasalRate.text = PLACEHOLDER
+                resourceHelper.gs(
+                    R.string.pump_basebasalrate,
+                    omnipodDashPumpPlugin.model()
+                        .determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(Date()))
+                )
+            } else {
+                PLACEHOLDER
+            }
 
             // total delivered
             podInfoBinding.totalDelivered.text =