format, cleanups
This commit is contained in:
Andrei Vereha
parent
badf8fe24d
commit
4664d21ddf
12 changed files with 39 additions and 44 deletions
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm
|
|
@ -95,7 +95,7 @@ class OmnipodDashBleManagerImpl @Inject constructor(private val context: Context
|
|||
companion object {
|
||||
|
||||
private const val CONNECT_TIMEOUT_MS = 5000
|
||||
public const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
|
||||
const val CONTROLLER_ID = 4242 // TODO read from preferences or somewhere else.
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -34,13 +34,13 @@ class ServiceDiscoverer(private val logger: AAPSLogger, private val gatt: Blueto
|
|||
return chars
|
||||
}
|
||||
|
||||
|
||||
private fun String.toUuid(): UUID = UUID(
|
||||
BigInteger(replace("-", "").substring(0, 16), 16).toLong(),
|
||||
BigInteger(replace("-", "").substring(16), 16).toLong()
|
||||
)
|
||||
|
||||
companion object {
|
||||
|
||||
private const val SERVICE_UUID = "1a7e-4024-e3ed-4464-8b7e-751e03d0dc5f"
|
||||
private const val DISCOVER_SERVICES_TIMEOUT_MS = 5000
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.ltk
|
||||
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.BleIO
|
||||
|
||||
data class LTK(val ltk: ByteArray, val noncePrefix: ByteArray) {
|
||||
init {
|
||||
require(ltk.size == 16)
|
||||
require(noncePrefix.size == 16)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ data class PairMessage(
|
|||
sequenceNumber = sequenceNumber,
|
||||
sas = true, // TODO: understand why this is true for PairMessages
|
||||
),
|
||||
) {}
|
||||
)
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
|
||||
|
||||
interface Message {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
fun messagePacket(): MessagePacket
|
||||
}
|
||||
|
|
@ -4,8 +4,11 @@ import info.nightscout.androidaps.logging.AAPSLogger
|
|||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.command.*
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.UnexpectedCommandException
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.*
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.PayloadSplitter
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.BleIO
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.CharacteristicType
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.PayloadJoiner
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.PayloadJoinerActionAccept
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io.PayloadJoinerActionReject
|
||||
import info.nightscout.androidaps.utils.extensions.toHex
|
||||
|
||||
class MessageIO(private val aapsLogger: AAPSLogger, private val bleIO: BleIO) {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@ enum class MessageType(val value: Byte) {
|
|||
PAIRING(3);
|
||||
|
||||
companion object {
|
||||
|
||||
fun byValue(value: Byte): MessageType =
|
||||
MessageType.values().firstOrNull() {it.value == value}
|
||||
MessageType.values().firstOrNull { it.value == value }
|
||||
?: throw IllegalArgumentException("Unknown MessageType: $value")
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.io
|
||||
package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message
|
||||
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.BlePacket
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.FirstBlePacket
|
||||
|
|
@ -9,9 +9,10 @@ import java.lang.Integer.min
|
|||
import java.util.zip.CRC32
|
||||
|
||||
internal class PayloadSplitter(private val payload: ByteArray) {
|
||||
|
||||
fun splitInPackets(): List<BlePacket> {
|
||||
val ret = ArrayList<BlePacket>()
|
||||
val crc32 = payload.crc32();
|
||||
val crc32 = payload.crc32()
|
||||
if (payload.size <= 18) {
|
||||
val end = min(14, payload.size)
|
||||
ret.add(FirstBlePacket(
|
||||
|
|
@ -26,7 +27,7 @@ internal class PayloadSplitter(private val payload: ByteArray) {
|
|||
payload = payload.copyOfRange(end, payload.size),
|
||||
))
|
||||
}
|
||||
return ret;
|
||||
return ret
|
||||
}
|
||||
val middleFragments = (payload.size - 18) / 19
|
||||
val rest = ((payload.size - middleFragments.toInt() * 19) - 18).toByte()
|
||||
|
|
@ -58,7 +59,7 @@ internal class PayloadSplitter(private val payload: ByteArray) {
|
|||
payload = payload.copyOfRange(middleFragments * 19 + 18 + 14, payload.size),
|
||||
))
|
||||
}
|
||||
return ret;
|
||||
return ret
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -7,6 +7,7 @@ sealed class BlePacket {
|
|||
abstract fun asByteArray(): ByteArray
|
||||
|
||||
companion object {
|
||||
|
||||
const val MAX_BLE_PACKET_LEN = 30 // we use this as the size allocated for the ByteBuffer
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
|
|||
|
||||
private val sequenceNo: Int
|
||||
private val lotNo: Long
|
||||
|
||||
@Throws(DiscoveredInvalidPodException::class)
|
||||
private fun validateServiceUUIDs() {
|
||||
val serviceUuids = scanRecord.serviceUuids
|
||||
|
|
@ -65,7 +66,8 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val scanRecord: Sc
|
|||
}
|
||||
|
||||
companion object {
|
||||
const val MAIN_SERVICE_UUID = "4024";
|
||||
|
||||
const val MAIN_SERVICE_UUID = "4024"
|
||||
const val UNKNOWN_THIRD_SERVICE_UUID = "000a" // FIXME: why is this 000a?
|
||||
private fun extractUUID16(uuid: ParcelUuid): String {
|
||||
return uuid.toString().substring(4, 8)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue