caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into avereha/dash

Browse source
This commit is contained in:
Milos Kozak 2021-09-29 23:04:05 +02:00
commit 6a8d3e25ee
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
View file

@ -439,7 +439,7 @@ class DanaRSPlugin @Inject constructor(
result.enacted = false result.enacted = false
result.success = false result.success = false
result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror) result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
aapsLogger.error("setTempBasalPercent: Failed to set temp basal") aapsLogger.error("setTempBasalPercent: Failed to set temp basal. connectionOK: $connectionOK isTempBasalInProgress: ${danaPump.isTempBasalInProgress} tempBasalPercent: ${danaPump.tempBasalPercent}")
return result return result
} }

1
danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt
View file

@ -376,6 +376,7 @@ class DanaRSService : DaggerService() {
sendMessage(msgTBR) sendMessage(msgTBR)
loadEvents() loadEvents()
val tbr = pumpSync.expectedPumpState().temporaryBasal val tbr = pumpSync.expectedPumpState().temporaryBasal
aapsLogger.debug(LTag.PUMPCOMM, "Expected TBR found: $tbr")
danaPump.fromTemporaryBasal(tbr) danaPump.fromTemporaryBasal(tbr)
rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING)) rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
return msgTBR.success() return msgTBR.success()