caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

disconnect on force deactivation when pump in error state

Browse source
This commit is contained in:
jbr7rr 2023-08-06 14:21:21 +02:00
parent 826b0f3d8c
commit 30c1c16cd0
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt
View file

@ -187,6 +187,8 @@ class MedtrumService : DaggerService(), BLECommCallback {
if (medtrumPump.tempBasalInProgress) { if (medtrumPump.tempBasalInProgress) {
result = sendPacketAndGetResponse(CancelTempBasalPacket(injector)) result = sendPacketAndGetResponse(CancelTempBasalPacket(injector))
} }
// Make sure we have all events of this patch if possible
loadEvents()
if (result) result = sendPacketAndGetResponse(StopPatchPacket(injector)) if (result) result = sendPacketAndGetResponse(StopPatchPacket(injector))
return result return result
} }

3
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumViewModel.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.pump.medtrum.ui.viewmodel package info.nightscout.pump.medtrum.ui.viewmodel
import android.os.SystemClock
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import info.nightscout.interfaces.queue.Callback import info.nightscout.interfaces.queue.Callback
@ -255,6 +256,8 @@ class MedtrumViewModel @Inject constructor(
if (medtrumPump.pumpState >= MedtrumPumpState.OCCLUSION && medtrumPump.pumpState <= MedtrumPumpState.NO_CALIBRATION) { if (medtrumPump.pumpState >= MedtrumPumpState.OCCLUSION && medtrumPump.pumpState <= MedtrumPumpState.NO_CALIBRATION) {
// We are in a fault state, we need to force deactivation // We are in a fault state, we need to force deactivation
aapsLogger.info(LTag.PUMP, "deactivatePatch: force deactivation") aapsLogger.info(LTag.PUMP, "deactivatePatch: force deactivation")
medtrumService?.disconnect("ForceDeactivation")
SystemClock.sleep(1000)
medtrumPump.pumpState = MedtrumPumpState.STOPPED medtrumPump.pumpState = MedtrumPumpState.STOPPED
} else { } else {
aapsLogger.info(LTag.PUMP, "deactivatePatch: failure!") aapsLogger.info(LTag.PUMP, "deactivatePatch: failure!")