caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Use correct message for patch start time and patch age

Browse source
This commit is contained in:
jbr7rr 2023-07-10 19:58:34 +02:00
parent fb62b0d90c
commit dda7fa6086
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pump/medtrum/src/main/java/info/nightscout/pump/medtrum/comm/packets/NotificationPacket.kt
View file

@ -47,12 +47,12 @@ class NotificationPacket(val injector: HasAndroidInjector) {
private const val MASK_SETUP = 0x10 private const val MASK_SETUP = 0x10
private const val MASK_RESERVOIR = 0x20 private const val MASK_RESERVOIR = 0x20
private const val MASK_LIFE_TIME = 0x40 private const val MASK_START_TIME = 0x40
private const val MASK_BATTERY = 0x80 private const val MASK_BATTERY = 0x80
private const val MASK_STORAGE = 0x100 private const val MASK_STORAGE = 0x100
private const val MASK_ALARM = 0x200 private const val MASK_ALARM = 0x200
private const val MASK_START_TIME = 0x400 private const val MASK_AGE = 0x400
private const val MASK_UNKNOWN_1 = 0x800 private const val MASK_UNKNOWN_1 = 0x800
private const val MASK_UNUSED_CGM = 0x1000 private const val MASK_UNUSED_CGM = 0x1000
@ -146,10 +146,14 @@ class NotificationPacket(val injector: HasAndroidInjector) {
offset += 2 offset += 2
} }
if (fieldMask and MASK_LIFE_TIME != 0) { if (fieldMask and MASK_START_TIME != 0) {
aapsLogger.debug(LTag.PUMPCOMM, "Life time notification received") aapsLogger.debug(LTag.PUMPCOMM, "Start time notification received")
medtrumPump.patchAge = data.copyOfRange(offset, offset + 4).toLong() val patchStartTime = MedtrumTimeUtil().convertPumpTimeToSystemTimeMillis(data.copyOfRange(offset, offset + 4).toLong())
aapsLogger.debug(LTag.PUMPCOMM, "Patch age: ${medtrumPump.patchAge}") if (medtrumPump.patchStartTime != patchStartTime) {
aapsLogger.debug(LTag.PUMPCOMM, "Patch start time changed from ${medtrumPump.patchStartTime} to $patchStartTime")
medtrumPump.patchStartTime = patchStartTime
}
aapsLogger.debug(LTag.PUMPCOMM, "Patch start time: ${patchStartTime}")
offset += 4 offset += 4
} }
@ -201,14 +205,10 @@ class NotificationPacket(val injector: HasAndroidInjector) {
offset += 4 offset += 4
} }
if (fieldMask and MASK_START_TIME != 0) { if (fieldMask and MASK_AGE != 0) {
aapsLogger.debug(LTag.PUMPCOMM, "Start time notification received") aapsLogger.debug(LTag.PUMPCOMM, "Age notification received")
val patchStartTime = MedtrumTimeUtil().convertPumpTimeToSystemTimeMillis(data.copyOfRange(offset, offset + 4).toLong()) medtrumPump.patchAge = data.copyOfRange(offset, offset + 4).toLong()
if (medtrumPump.patchStartTime != patchStartTime) { aapsLogger.debug(LTag.PUMPCOMM, "Patch age: ${medtrumPump.patchAge}")
aapsLogger.debug(LTag.PUMPCOMM, "Patch start time changed from ${medtrumPump.patchStartTime} to $patchStartTime")
medtrumPump.patchStartTime = patchStartTime
}
aapsLogger.debug(LTag.PUMPCOMM, "Patch start time: ${patchStartTime}")
offset += 4 offset += 4
} }