caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ble: address review comments: renames and removed unused vars

Browse source
This commit is contained in:
Andrei Vereha 2021-02-25 19:19:06 +01:00
parent f2fed8adc4
commit 9b7d31ba2c
5 changed files with 20 additions and 21 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/CharacteristicType.kt
View file

@ -6,7 +6,7 @@ import java.util.*
enum class CharacteristicType(val value: String) { enum class CharacteristicType(val value: String) {
CMD("1a7e2441-e3ed-4464-8b7e-751e03d0dc5f"), DATA("1a7e2442-e3ed-4464-8b7e-751e03d0dc5f"); CMD("1a7e2441-e3ed-4464-8b7e-751e03d0dc5f"), DATA("1a7e2442-e3ed-4464-8b7e-751e03d0dc5f");
val uUID: UUID val uuid: UUID
get() = UUID( get() = UUID(
BigInteger(value.replace("-", "").substring(0, 16), 16).toLong(), BigInteger(value.replace("-", "").substring(0, 16), 16).toLong(),
BigInteger(value.replace("-", "").substring(16), 16).toLong() BigInteger(value.replace("-", "").substring(16), 16).toLong()

5
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/ServiceDiscoverer.kt
View file

@ -4,7 +4,6 @@ import android.bluetooth.BluetoothGatt
import android.bluetooth.BluetoothGattCharacteristic import android.bluetooth.BluetoothGattCharacteristic
import info.nightscout.androidaps.logging.AAPSLogger import info.nightscout.androidaps.logging.AAPSLogger
import info.nightscout.androidaps.logging.LTag import info.nightscout.androidaps.logging.LTag
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.CharacteristicType
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.callbacks.BleCommCallbacks
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CharacteristicNotFoundException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.CharacteristicNotFoundException
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ServiceNotFoundException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.ServiceNotFoundException
@ -24,9 +23,9 @@ class ServiceDiscoverer(private val logger: AAPSLogger, private val gatt: Blueto
logger.debug(LTag.PUMPBTCOMM, "Services discovered") logger.debug(LTag.PUMPBTCOMM, "Services discovered")
val service = gatt.getService(SERVICE_UUID.toUuid()) val service = gatt.getService(SERVICE_UUID.toUuid())
?: throw ServiceNotFoundException(SERVICE_UUID) ?: throw ServiceNotFoundException(SERVICE_UUID)
val cmdChar = service.getCharacteristic(CharacteristicType.CMD.uUID) val cmdChar = service.getCharacteristic(CharacteristicType.CMD.uuid)
?: throw CharacteristicNotFoundException(CharacteristicType.CMD.value) ?: throw CharacteristicNotFoundException(CharacteristicType.CMD.value)
val dataChar = service.getCharacteristic(CharacteristicType.DATA.uUID) // TODO: this is never used val dataChar = service.getCharacteristic(CharacteristicType.DATA.uuid) // TODO: this is never used
?: throw CharacteristicNotFoundException(CharacteristicType.DATA.value) ?: throw CharacteristicNotFoundException(CharacteristicType.DATA.value)
var chars = mapOf(CharacteristicType.CMD to cmdChar, var chars = mapOf(CharacteristicType.CMD to cmdChar,
CharacteristicType.DATA to dataChar) CharacteristicType.DATA to dataChar)

1
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/command/BleCommandType.kt
View file

@ -5,6 +5,7 @@ enum class BleCommandType(val value: Byte) {
companion object { companion object {
@JvmStatic
fun byValue(value: Byte): BleCommandType = fun byValue(value: Byte): BleCommandType =
BleCommandType.values().firstOrNull { it.value == value } BleCommandType.values().firstOrNull { it.value == value }
?: throw IllegalArgumentException("Unknown BleCommandType: $value") ?: throw IllegalArgumentException("Unknown BleCommandType: $value")

32
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/BleDiscoveredDevice.kt
View file

@ -4,7 +4,7 @@ import android.bluetooth.le.ScanResult
import android.os.ParcelUuid import android.os.ParcelUuid
import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.DiscoveredInvalidPodException import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.exceptions.DiscoveredInvalidPodException
class BleDiscoveredDevice(val scanResult: ScanResult, private val podID: Long) { class BleDiscoveredDevice(val scanResult: ScanResult, private val podId: Long) {
private val sequenceNo: Int private val sequenceNo: Int
private val lotNo: Long private val lotNo: Long
@ -12,29 +12,29 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val podID: Long) {
private fun validateServiceUUIDs() { private fun validateServiceUUIDs() {
val scanRecord = scanResult.scanRecord val scanRecord = scanResult.scanRecord
?: throw DiscoveredInvalidPodException("Scan record is null"); ?: throw DiscoveredInvalidPodException("Scan record is null");
val serviceUUIDs = scanRecord.serviceUuids val serviceUuids = scanRecord.serviceUuids
if (serviceUUIDs.size != 9) { if (serviceUuids.size != 9) {
throw DiscoveredInvalidPodException("Expected 9 service UUIDs, got" + serviceUUIDs.size, serviceUUIDs) throw DiscoveredInvalidPodException("Expected 9 service UUIDs, got" + serviceUuids.size, serviceUuids)
} }
if (extractUUID16(serviceUUIDs[0]) != "4024") { if (extractUUID16(serviceUuids[0]) != MAIN_SERVICE_UUID) {
// this is the service that we filtered for // this is the service that we filtered for
throw DiscoveredInvalidPodException("The first exposed service UUID should be 4024, got " + extractUUID16(serviceUUIDs[0]), serviceUUIDs) throw DiscoveredInvalidPodException("The first exposed service UUID should be 4024, got " + extractUUID16(serviceUuids[0]), serviceUuids)
} }
// TODO understand what is serviceUUIDs[1]. 0x2470. Alarms? // TODO understand what is serviceUUIDs[1]. 0x2470. Alarms?
if (extractUUID16(serviceUUIDs[2]) != "000a") { if (extractUUID16(serviceUuids[2]) != "000a") {
// constant? // constant?
throw DiscoveredInvalidPodException("The third exposed service UUID should be 000a, got " + serviceUUIDs[2], serviceUUIDs) throw DiscoveredInvalidPodException("The third exposed service UUID should be 000a, got " + serviceUuids[2], serviceUuids)
} }
} }
@Throws(DiscoveredInvalidPodException::class) @Throws(DiscoveredInvalidPodException::class)
private fun validatePodID() { private fun validatePodId() {
val scanRecord = scanResult.scanRecord val scanRecord = scanResult.scanRecord
val serviceUUIDs = scanRecord.serviceUuids val serviceUUIDs = scanRecord.serviceUuids
val hexPodID = extractUUID16(serviceUUIDs[3]) + extractUUID16(serviceUUIDs[4]) val hexPodId = extractUUID16(serviceUUIDs[3]) + extractUUID16(serviceUUIDs[4])
val podID = hexPodID.toLong(16) val podId = hexPodId.toLong(16)
if (this.podID != podID) { if (this.podId != podId) {
throw DiscoveredInvalidPodException("This is not the POD we are looking for. " + this.podID + " found: " + podID, serviceUUIDs) throw DiscoveredInvalidPodException("This is not the POD we are looking for. " + this.podId + " found: " + this.podId, serviceUUIDs)
} }
} }
@ -58,14 +58,14 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val podID: Long) {
override fun toString(): String { override fun toString(): String {
return "BleDiscoveredDevice{" + return "BleDiscoveredDevice{" +
"scanResult=" + scanResult + "scanResult=" + scanResult +
", podID=" + podID + ", podID=" + podId +
", sequenceNo=" + sequenceNo + ", sequenceNo=" + sequenceNo +
", lotNo=" + lotNo + ", lotNo=" + lotNo +
'}' '}'
} }
companion object { companion object {
const val MAIN_SERVICE_UUID = "4024";
private fun extractUUID16(uuid: ParcelUuid): String { private fun extractUUID16(uuid: ParcelUuid): String {
return uuid.toString().substring(4, 8) return uuid.toString().substring(4, 8)
} }
@ -73,7 +73,7 @@ class BleDiscoveredDevice(val scanResult: ScanResult, private val podID: Long) {
init { init {
validateServiceUUIDs() validateServiceUUIDs()
validatePodID() validatePodId()
lotNo = parseLotNo() lotNo = parseLotNo()
sequenceNo = parseSeqNo() sequenceNo = parseSeqNo()
} }

1
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/scan/ScanCollector.kt
View file

@ -21,7 +21,6 @@ class ScanCollector(private val logger: AAPSLogger, private val podID: Long) : S
} }
override fun onScanFailed(errorCode: Int) { override fun onScanFailed(errorCode: Int) {
scanFailed = errorCode
logger.warn(LTag.PUMPBTCOMM, "Scan failed with errorCode: $errorCode") logger.warn(LTag.PUMPBTCOMM, "Scan failed with errorCode: $errorCode")
super.onScanFailed(errorCode) super.onScanFailed(errorCode)
} }