caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DanaI 0x0A support

Browse source
This commit is contained in:
Milos Kozak 2023-02-24 20:00:07 +01:00
parent da76506e01
commit 909e909525
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pump/dana/src/main/java/info/nightscout/pump/dana/DanaPump.kt
View file

@ -411,19 +411,19 @@ class DanaPump @Inject constructor(
fun modelFriendlyName(): String = fun modelFriendlyName(): String =
when (hwModel) { when (hwModel) {
0x01 -> "DanaR Korean" 0x01 -> "DanaR Korean"
0x03 -> 0x03 ->
when (protocol) { when (protocol) {
0x00 -> "DanaR old" 0x00 -> "DanaR old"
0x02 -> "DanaR v2" 0x02 -> "DanaR v2"
else -> "DanaR" // 0x01 and 0x03 known else -> "DanaR" // 0x01 and 0x03 known
} }
0x05 -> 0x05 ->
if (protocol < 10) "DanaRS" if (protocol < 10) "DanaRS"
else "DanaRS v3" else "DanaRS v3"
0x06 -> "DanaRS Korean" 0x06 -> "DanaRS Korean"
0x07 -> "Dana-i (BLE4.2)" 0x07 -> "Dana-i (BLE4.2)"
0x09 -> "Dana-i (BLE5)" 0x09, 0x0A -> "Dana-i (BLE5)"
else -> "Unknown Dana pump" else -> "Unknown Dana pump"
} }
fun pumpType(): PumpType = fun pumpType(): PumpType =

2
pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt
View file

@ -573,7 +573,7 @@ class BLEComm @Inject internal constructor(
disconnect("Non existing pairing key") disconnect("Non existing pairing key")
} }
if (danaPump.hwModel == 0x09) { if (danaPump.hwModel == 0x09 || danaPump.hwModel == 0x0A) {
bleEncryption.setBle5Key(storedPairingKey.encodeToByteArray()) bleEncryption.setBle5Key(storedPairingKey.encodeToByteArray())
aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK BLE5 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer)) aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK BLE5 (OK)" + " " + DanaRSPacket.toHexString(decryptedBuffer))
// Dana-i BLE5 Pump // Dana-i BLE5 Pump