caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Loop: check for empty queue sooner

Browse source
This commit is contained in:
Milos Kozak 2023-06-15 16:34:26 +02:00
parent a5774b6e2e
commit a108158909
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/interfaces/src/main/java/info/nightscout/interfaces/aps/APS.kt
View file

@ -7,5 +7,6 @@ interface APS {
var lastDetermineBasalAdapter: DetermineBasalAdapter? var lastDetermineBasalAdapter: DetermineBasalAdapter?
var lastAutosensResult: AutosensResult var lastAutosensResult: AutosensResult
operator fun invoke(initiator: String, tempBasalFallback: Boolean) fun isEnabled(): Boolean
fun invoke(initiator: String, tempBasalFallback: Boolean)
} }

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
View file

@ -218,7 +218,7 @@ class LoopPlugin @Inject constructor(
val start = dateUtil.now() val start = dateUtil.now()
while (start + T.mins(maxMinutes).msecs() > dateUtil.now()) { while (start + T.mins(maxMinutes).msecs() > dateUtil.now()) {
if (commandQueue.size() == 0 && commandQueue.performing() == null) return true if (commandQueue.size() == 0 && commandQueue.performing() == null) return true
SystemClock.sleep(100) SystemClock.sleep(1000)
} }
return false return false
} }
@ -247,10 +247,16 @@ class LoopPlugin @Inject constructor(
return return
} }
if (!isEmptyQueue()) {
aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.pump_busy))
rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.pump_busy)))
return
}
// Check if pump info is loaded // Check if pump info is loaded
if (pump.baseBasalRate < 0.01) return if (pump.baseBasalRate < 0.01) return
val usedAPS = activePlugin.activeAPS val usedAPS = activePlugin.activeAPS
if ((usedAPS as PluginBase).isEnabled()) { if (usedAPS.isEnabled()) {
usedAPS.invoke(initiator, tempBasalFallback) usedAPS.invoke(initiator, tempBasalFallback)
apsResult = usedAPS.lastAPSResult apsResult = usedAPS.lastAPSResult
} }
@ -261,12 +267,6 @@ class LoopPlugin @Inject constructor(
return return
} }
if (!isEmptyQueue()) {
aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.pump_busy))
rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.pump_busy)))
return
}
// Prepare for pumps using % basals // Prepare for pumps using % basals
if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) { if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT && allowPercentage()) {
apsResult.usePercent = true apsResult.usePercent = true