caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

add logging. try to prevent race condition

Browse source
This commit is contained in:
Andrei Vereha 2021-06-26 15:06:57 +02:00
parent b9acc21633
commit cb45e51b99
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,6 +185,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
override fun getPumpStatus(reason: String) { override fun getPumpStatus(reason: String) {
aapsLogger.debug(LTag.PUMP, "getPumpStatus reason=$reason")
if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) { if (reason != "REQUESTED BY USER" && !podStateManager.isActivationCompleted) {
// prevent races on BLE when the pod is not activated // prevent races on BLE when the pod is not activated
return return
@ -263,6 +264,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
if (!podStateManager.isActivationCompleted) { if (!podStateManager.isActivationCompleted) {
return PumpEnactResult(injector).success(true).enacted(true) return PumpEnactResult(injector).success(true).enacted(true)
} }
aapsLogger.debug(LTag.PUMP, "setNewBasalProfile profile=$profile")
val basalProgram = mapProfileToBasalProgram(profile) val basalProgram = mapProfileToBasalProgram(profile)
var deliverySuspended = false var deliverySuspended = false
return executeProgrammingCommand( return executeProgrammingCommand(
@ -324,7 +326,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
rxBus.send(EventTempBasalChange()) rxBus.send(EventTempBasalChange())
} }
.ignoreElements() .ignoreElements()
).doOnComplete() { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.FAILED_UPDATE_PROFILE, Notification.FAILED_UPDATE_PROFILE,
"Suspend delivery is unconfirmed! " + "Suspend delivery is unconfirmed! " +
@ -734,10 +736,11 @@ class OmnipodDashPumpPlugin @Inject constructor(
executeProgrammingCommand( executeProgrammingCommand(
historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL), historyEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements() command = omnipodManager.stopTempBasal(hasTempBasalBeepEnabled()).ignoreElements()
).doFinally { ).doOnComplete {
notifyOnUnconfirmed( notifyOnUnconfirmed(
Notification.OMNIPOD_TBR_ALERTS, Notification.OMNIPOD_TBR_ALERTS,
"Setting temp basal failed. If a temp basal was previously running, it might have been cancelled. " + "Cancelling temp basal might have failed." +
"If a temp basal was previously running, it might have been cancelled." +
"Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n "Please manually refresh the Pod status from the Omnipod tab.", // TODO: i8n
R.raw.boluserror, R.raw.boluserror,
) )
@ -795,6 +798,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
private fun notifyOnUnconfirmed(notificationId: Int, msg: String, sound: Int?) { private fun notifyOnUnconfirmed(notificationId: Int, msg: String, sound: Int?) {
if (podStateManager.activeCommand != null) { if (podStateManager.activeCommand != null) {
aapsLogger.debug(LTag.PUMP, "Notification for active command: ${podStateManager.activeCommand}")
showNotification(notificationId, msg, Notification.URGENT, sound) showNotification(notificationId, msg, Notification.URGENT, sound)
} }
} }
@ -1044,7 +1048,6 @@ class OmnipodDashPumpPlugin @Inject constructor(
podStateManager.tempBasal = null podStateManager.tempBasal = null
} }
rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS)) rxBus.send(EventDismissNotification(Notification.OMNIPOD_TBR_ALERTS))
} }
OmnipodCommandType.RESUME_DELIVERY -> { OmnipodCommandType.RESUME_DELIVERY -> {
// We can't invalidate this command, // We can't invalidate this command,