caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

format: CTRL+Alt+L

Browse source
This commit is contained in:
Andrei Vereha 2021-03-03 14:17:55 +01:00
parent 154e74fc22
commit da84c35b31
6 changed files with 15 additions and 18 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/comm/OmnipodDashBleManagerImpl.kt
View file

@ -132,7 +132,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(
aapsLogger.info(LTag.PUMPCOMM, "Got LTK: ${ltk.ltk.toHex()}") aapsLogger.info(LTag.PUMPCOMM, "Got LTK: ${ltk.ltk.toHex()}")
// emitter.onNext(PodEvent.EstablishingSession) emitter.onNext(PodEvent.EstablishingSession)
val eapAkaExchanger = EapAkaExchanger(aapsLogger, msgIO, ltk) val eapAkaExchanger = EapAkaExchanger(aapsLogger, msgIO, ltk)
val sessionKeys = eapAkaExchanger.negotiateSessionKeys() val sessionKeys = eapAkaExchanger.negotiateSessionKeys()

6
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/io/BleIO.kt
View file

@ -82,11 +82,11 @@ class BleIO(
* The incoming queues should be empty, so we log when they are not. * The incoming queues should be empty, so we log when they are not.
*/ */
fun flushIncomingQueues() { fun flushIncomingQueues() {
for (chr in CharacteristicType.values()) { for (char in CharacteristicType.values()) {
do { do {
val found = incomingPackets[chr]?.poll() val found = incomingPackets[char]?.poll()
found?.let { found?.let {
aapsLogger.warn(LTag.PUMPBTCOMM, "BleIO: CMD queue not empty, flushing: {${found.toHex()}") aapsLogger.warn(LTag.PUMPBTCOMM, "BleIO: ${char.name} queue not empty, flushing: {${found.toHex()}")
} }
} while (found != null) } while (found != null)
} }

3
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapAkaExchanger.kt
View file

@ -111,9 +111,6 @@ class EapAkaExchanger(private val aapsLogger: AAPSLogger, private val msgIO: Mes
companion object { companion object {
private val MILENAGE_OP = Hex.decode("cdc202d5123e20f62b6d676ac72cb318")
private val MILENAGE_AMF = Hex.decode("b9b9")
private const val KEY_SIZE = 16 // 128 bits
private const val IV_SIZE = 4 private const val IV_SIZE = 4
} }
} }