Merge pull request #4660 from nightscout/dev

3.4.2.1

Author: MilosKozak

buildSrc/src/main/kotlin/Versions.kt

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 @Suppress("ConstPropertyName")
 object Versions {
 
-    const val appVersion = "3.4.2.0"
+    const val appVersion = "3.4.2.1"
     const val versionCode = 1500
 
     const val compileSdk = 36

pump/equil/src/main/kotlin/app/aaps/pump/equil/manager/EquilManager.kt

@@ -263,6 +263,7 @@ class EquilManager @Inject constructor(
                 }
                 // constraint percent.
                 percent = min(percent, 100.0f)
+                rxBus.send(EventOverviewBolusProgress(rh, percent = 100, id = detailedBolusInfo.id))
                 result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok)
             } else {
                 result.success = false

pump/equil/src/main/kotlin/app/aaps/pump/equil/ui/pair/EquilPairConfirmFragment.kt

@@ -94,8 +94,9 @@ class EquilPairConfirmFragment : EquilPairFragmentBase() {
 
     private fun setLimits() {
         showLoading()
-        val profile = pumpSync.expectedPumpState().profile ?: return
-        commandQueue.customCommand(CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), constraintsChecker.getMaxBasalAllowed(profile).value(), aapsLogger, preferences, equilManager), object : Callback() {
+        val profile = pumpSync.expectedPumpState().profile
+        val maxBasal = if (profile != null) constraintsChecker.getMaxBasalAllowed(profile).value() else hardLimits.maxBasal()
+        commandQueue.customCommand(CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), maxBasal, aapsLogger, preferences, equilManager), object : Callback() {
             override fun run() {
                 if (activity == null) return
                 aapsLogger.debug(LTag.PUMPCOMM, "setLimits result====" + result.success + "====")

pump/equil/src/main/kotlin/app/aaps/pump/equil/ui/pair/EquilPairFragmentBase.kt

@@ -10,6 +10,7 @@ import androidx.annotation.LayoutRes
 import androidx.navigation.fragment.findNavController
 import app.aaps.core.interfaces.constraints.ConstraintsChecker
 import app.aaps.core.interfaces.logging.AAPSLogger
+import app.aaps.core.interfaces.utils.HardLimits
 import app.aaps.core.interfaces.plugin.ActivePlugin
 import app.aaps.core.interfaces.pump.BlePreCheck
 import app.aaps.core.interfaces.pump.PumpSync
@@ -40,6 +41,7 @@ abstract class EquilPairFragmentBase : DaggerFragment() {
     @Inject lateinit var pumpSync: PumpSync
     @Inject lateinit var equilHistoryRecordDao: EquilHistoryRecordDao
     @Inject lateinit var constraintsChecker: ConstraintsChecker
+    @Inject lateinit var hardLimits: HardLimits
 
     private var _binding: EquilPairBaseFragmentBinding? = null
     private var _progressIndicationBinding: EquilPairProgressBinding? = null

pump/equil/src/main/kotlin/app/aaps/pump/equil/ui/pair/EquilPairSerialNumberFragment.kt

@@ -349,8 +349,9 @@ class EquilPairSerialNumberFragment : EquilPairFragmentBase() {
     }
 
     private fun pumpSettings(address: String, serialNumber: String) {
-        val profile = pumpSync.expectedPumpState().profile ?: return
-        commandQueue.customCommand(CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), constraintsChecker.getMaxBasalAllowed(profile).value(), aapsLogger, preferences, equilManager), object : Callback() {
+        val profile = pumpSync.expectedPumpState().profile
+        val maxBasal = if (profile != null) constraintsChecker.getMaxBasalAllowed(profile).value() else hardLimits.maxBasal()
+        commandQueue.customCommand(CmdSettingSet(constraintsChecker.getMaxBolusAllowed().value(), maxBasal, aapsLogger, preferences, equilManager), object : Callback() {
             override fun run() {
                 if (activity == null) return
                 if (result.success) {