From fffe014d4ecb9e1e0920bdacd3c44e983b0890a4 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Mon, 2 Jan 2023 21:20:42 +0100 Subject: [PATCH] combov2: Apply changes from comboctl Signed-off-by: Carlos Rafael Giani --- .../kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt | 2 +- .../main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt index c8d9cd62e8..cc5646e2a9 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Fragment.kt @@ -81,7 +81,7 @@ class ComboV2Fragment : DaggerFragment() { else rh.gs(R.string.combov2_cancelling_tbr) is ComboCtlPump.DeliveringBolusCommandDesc -> - rh.gs(R.string.combov2_delivering_bolus_cmddesc, desc.bolusAmount.cctlBolusToIU()) + rh.gs(R.string.combov2_delivering_bolus_cmddesc, desc.immediateBolusAmount.cctlBolusToIU()) is ComboCtlPump.FetchingTDDHistoryCommandDesc -> rh.gs(R.string.combov2_fetching_tdd_history_cmddesc) is ComboCtlPump.UpdatingPumpDateTimeCommandDesc -> diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt index 341ac5323e..95cd290957 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt @@ -1768,8 +1768,8 @@ class ComboV2Plugin @Inject constructor ( is RTCommandProgressStage.DeliveringBolus -> rh.gs( R.string.combov2_delivering_bolus, - stage.deliveredAmount.cctlBolusToIU(), - stage.totalAmount.cctlBolusToIU() + stage.deliveredImmediateAmount .cctlBolusToIU(), + stage.totalImmediateAmount.cctlBolusToIU() ) else -> "" }