caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

RS: handle error state

Browse source
This commit is contained in:
Milos Kozak 2020-11-06 19:08:13 +01:00
parent bd15fae39e
commit dac2241baa
2 changed files with 3 additions and 3 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

@ -210,7 +210,7 @@ class DanaRSPlugin @Inject constructor(
} }
override fun isSuspended(): Boolean { override fun isSuspended(): Boolean {
return danaPump.pumpSuspended return danaPump.pumpSuspended || danaPump.errorState != DanaPump.ErrorState.NONE
} }
override fun isBusy(): Boolean { override fun isBusy(): Boolean {

4
danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Initial_Screen_Information.kt
View file

@ -57,8 +57,8 @@ class DanaRS_Packet_General_Initial_Screen_Information(
//protocol 10+ //protocol 10+
dataIndex += dataSize dataIndex += dataSize
dataSize = 1 dataSize = 1
danaPump.errorState = info.nightscout.androidaps.dana.DanaPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))] danaPump.errorState = DanaPump.ErrorState[byteArrayToInt(getBytes(data, dataIndex, dataSize))]
?: info.nightscout.androidaps.dana.DanaPump.ErrorState.NONE ?: DanaPump.ErrorState.NONE
aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaPump.errorState.name) aapsLogger.debug(LTag.PUMPCOMM, "ErrorState: " + danaPump.errorState.name)
} }
aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaPump.pumpSuspended) aapsLogger.debug(LTag.PUMPCOMM, "Pump suspended: " + danaPump.pumpSuspended)