caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #136 from 0pen-dash/avereha/fix-remaning

Browse source 
Fix remaning units
This commit is contained in:
Andrei Vereha 2021-10-05 22:56:16 +02:00 committed by GitHub
parent 25b991a924 03b051eb8c
commit 263f7678e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponse.kt
View file

@ -24,7 +24,7 @@ class DefaultStatusResponse(
AlertUtil.decodeAlertSet((encoded[6].toInt() and 0xff shl 1 or (encoded[7] ushr 7)).toByte()) AlertUtil.decodeAlertSet((encoded[6].toInt() and 0xff shl 1 or (encoded[7] ushr 7)).toByte())
val minutesSinceActivation: Short = val minutesSinceActivation: Short =
(encoded[7] and 0x7f shl 6 or (encoded[8].toInt() and 0xff ushr 2 and 0x3f)).toShort() (encoded[7] and 0x7f shl 6 or (encoded[8].toInt() and 0xff ushr 2 and 0x3f)).toShort()
val reservoirPulsesRemaining: Short = (encoded[8] shl 8 or encoded[9].toInt() and 0x3ff).toShort() val reservoirPulsesRemaining: Short = (encoded[8] shl 8 or (encoded[9].toInt() and 0xff) and 0x3ff).toShort()
override fun toString(): String { override fun toString(): String {
return "DefaultStatusResponse(" + return "DefaultStatusResponse(" +

34
omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/response/DefaultStatusResponseTest.kt
View file

@ -27,7 +27,7 @@ class DefaultStatusResponseTest {
} }
/** /**
* response (hex) 08202EAA0C0A1D1905281000004387D3039A * response (hex) 1D1905281000004387D3039A
Status response: 29 Status response: 29
Pod status: RUNNING_BELOW_MIN_VOLUME Pod status: RUNNING_BELOW_MIN_VOLUME
Basal active: true Basal active: true
@ -66,7 +66,7 @@ class DefaultStatusResponseTest {
} }
/** /**
* response (hex) 08202EAA080A1D180519C00E0039A7FF8085 * response (hex) 1D180519C00E0039A7FF8085
Status response: 29 Status response: 29
Pod status: RUNNING_ABOVE_MIN_VOLUME Pod status: RUNNING_ABOVE_MIN_VOLUME
Basal active: true Basal active: true
@ -103,4 +103,34 @@ class DefaultStatusResponseTest {
Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining) Assert.assertEquals(1023.toShort(), response.reservoirPulsesRemaining)
Assert.assertEquals(2611.toShort(), response.totalPulsesDelivered) Assert.assertEquals(2611.toShort(), response.totalPulsesDelivered)
} }
/** response (hex) 1D990714201F0042ED8801DE
Status response: 29
Pod status: RUNNING_BELOW_MIN_VOLUME
Basal active: true
Temp Basal active: false
Immediate bolus active: false
Extended bolus active: true
Bolus pulses remaining: 31
sequence number of last programing command: 4
Total full pulses delivered: 3624
Full reservoir pulses remaining: 392
Time since activation: 4283
*/
@Test @Throws(DecoderException::class) fun testValidResponseBolusPulsesRemaining2() {
val encoded = Hex.decodeHex("1D990714201F0042ED8801DE")
val response = DefaultStatusResponse(encoded)
Assert.assertArrayEquals(encoded, response.encoded)
Assert.assertNotSame(encoded, response.encoded)
Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE, response.responseType)
Assert.assertEquals(ResponseType.DEFAULT_STATUS_RESPONSE.value, response.messageType)
Assert.assertEquals(DeliveryStatus.UNKNOWN, response.deliveryStatus) // Extended bolus active
Assert.assertEquals(PodStatus.RUNNING_BELOW_MIN_VOLUME, response.podStatus)
Assert.assertEquals(4.toShort(), response.sequenceNumberOfLastProgrammingCommand)
Assert.assertEquals(31.toShort(), response.bolusPulsesRemaining)
Assert.assertEquals(0, response.activeAlerts.size)
Assert.assertEquals(4283.toShort(), response.minutesSinceActivation)
Assert.assertEquals(392.toShort(), response.reservoirPulsesRemaining)
Assert.assertEquals(3624.toShort(), response.totalPulsesDelivered)
}
} }