aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-22 00:44:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix build issue.

Browse Source
This commit is contained in:
Sylwester Zieliński
2023-08-04 13:02:35 +02:00
parent 4f769e90c2
commit 09f570e4fa
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt
View File

@@ -35,7 +35,7 @@ import android.app.Application
import dagger.hilt.android.HiltAndroidApp import dagger.hilt.android.HiltAndroidApp
import no.nordicsemi.android.analytics.AppAnalytics import no.nordicsemi.android.analytics.AppAnalytics
import no.nordicsemi.android.analytics.AppOpenEvent import no.nordicsemi.android.analytics.AppOpenEvent
import no.nordicsemi.android.gls.UartServer import no.nordicsemi.android.uart.UartServer
import javax.inject.Inject import javax.inject.Inject
@HiltAndroidApp @HiltAndroidApp

87
profile_uart/src/debug/java/no/nordicsemi/android/gls/UartServer.kt → profile_uart/src/debug/java/no/nordicsemi/android/uart/UartServer.kt
View File

@@ -1,26 +1,26 @@
package no.nordicsemi.android.gls package no.nordicsemi.android.uart
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import no.nordicsemi.android.common.core.DataByteArray
import no.nordicsemi.android.kotlin.ble.advertiser.BleAdvertiser import no.nordicsemi.android.kotlin.ble.advertiser.BleAdvertiser
import no.nordicsemi.android.kotlin.ble.core.MockServerDevice import no.nordicsemi.android.kotlin.ble.core.MockServerDevice
import no.nordicsemi.android.kotlin.ble.core.advertiser.BleAdvertiseConfig import no.nordicsemi.android.kotlin.ble.core.advertiser.BleAdvertisingConfig
import no.nordicsemi.android.kotlin.ble.core.data.BleGattPermission import no.nordicsemi.android.kotlin.ble.core.data.BleGattPermission
import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty
import no.nordicsemi.android.kotlin.ble.profile.gls.RecordAccessControlPointInputParser import no.nordicsemi.android.kotlin.ble.profile.gls.RecordAccessControlPointInputParser
import no.nordicsemi.android.kotlin.ble.server.main.BleGattServer import no.nordicsemi.android.kotlin.ble.server.main.ServerBleGatt
import no.nordicsemi.android.kotlin.ble.server.main.service.BleGattServerServiceType import no.nordicsemi.android.kotlin.ble.server.main.service.ServerBleGattCharacteristic
import no.nordicsemi.android.kotlin.ble.server.main.service.BleServerGattCharacteristic import no.nordicsemi.android.kotlin.ble.server.main.service.ServerBleGattCharacteristicConfig
import no.nordicsemi.android.kotlin.ble.server.main.service.BleServerGattCharacteristicConfig import no.nordicsemi.android.kotlin.ble.server.main.service.ServerBleGattServiceConfig
import no.nordicsemi.android.kotlin.ble.server.main.service.BleServerGattServiceConfig import no.nordicsemi.android.kotlin.ble.server.main.service.ServerBleGattServiceType
import no.nordicsemi.android.kotlin.ble.server.main.service.BluetoothGattServerConnection import no.nordicsemi.android.kotlin.ble.server.main.service.ServerBluetoothGattConnection
import no.nordicsemi.android.uart.repository.BATTERY_LEVEL_CHARACTERISTIC_UUID import no.nordicsemi.android.uart.repository.BATTERY_LEVEL_CHARACTERISTIC_UUID
import no.nordicsemi.android.uart.repository.BATTERY_SERVICE_UUID import no.nordicsemi.android.uart.repository.BATTERY_SERVICE_UUID
import no.nordicsemi.android.uart.repository.UART_RX_CHARACTERISTIC_UUID import no.nordicsemi.android.uart.repository.UART_RX_CHARACTERISTIC_UUID
@@ -37,27 +37,27 @@ class UartServer @Inject constructor(
private val scope: CoroutineScope private val scope: CoroutineScope
) { ) {
lateinit var server: BleGattServer lateinit var server: ServerBleGatt
lateinit var glsCharacteristic: BleServerGattCharacteristic lateinit var glsCharacteristic: ServerBleGattCharacteristic
lateinit var glsContextCharacteristic: BleServerGattCharacteristic lateinit var glsContextCharacteristic: ServerBleGattCharacteristic
lateinit var racpCharacteristic: BleServerGattCharacteristic lateinit var racpCharacteristic: ServerBleGattCharacteristic
lateinit var batteryLevelCharacteristic: BleServerGattCharacteristic lateinit var batteryLevelCharacteristic: ServerBleGattCharacteristic
private var lastRequest = byteArrayOf() private var lastRequest = DataByteArray()
val YOUNGEST_RECORD = byteArrayOf(0x07, 0x00, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x05, 0x00, 0x00, 0x26, 0xD2.toByte(), 0x11) val YOUNGEST_RECORD = DataByteArray.from(0x07, 0x00, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x05, 0x00, 0x00, 0x26, 0xD2.toByte(), 0x11)
val OLDEST_RECORD = byteArrayOf(0x07, 0x04, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x11, 0x00, 0x00, 0x82.toByte(), 0xD2.toByte(), 0x11) val OLDEST_RECORD = DataByteArray.from(0x07, 0x04, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x11, 0x00, 0x00, 0x82.toByte(), 0xD2.toByte(), 0x11)
val records = listOf( val records = listOf(
YOUNGEST_RECORD, YOUNGEST_RECORD,
byteArrayOf(0x07, 0x01, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x08, 0x00, 0x00, 0x3D, 0xD2.toByte(), 0x11), DataByteArray.from(0x07, 0x01, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x08, 0x00, 0x00, 0x3D, 0xD2.toByte(), 0x11),
byteArrayOf(0x07, 0x02, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x0B, 0x00, 0x00, 0x54, 0xD2.toByte(), 0x11), DataByteArray.from(0x07, 0x02, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x0B, 0x00, 0x00, 0x54, 0xD2.toByte(), 0x11),
byteArrayOf(0x07, 0x03, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x0E, 0x00, 0x00, 0x6B, 0xD2.toByte(), 0x11), DataByteArray.from(0x07, 0x03, 0x00, 0xDC.toByte(), 0x07, 0x01, 0x01, 0x0C, 0x1E, 0x0E, 0x00, 0x00, 0x6B, 0xD2.toByte(), 0x11),
OLDEST_RECORD OLDEST_RECORD
) )
val racp = byteArrayOf(0x06, 0x00, 0x01, 0x01) val racp = DataByteArray.from(0x06, 0x00, 0x01, 0x01)
fun start( fun start(
context: Context, context: Context,
@@ -66,44 +66,44 @@ class UartServer @Inject constructor(
address = "55:44:33:22:11" address = "55:44:33:22:11"
), ),
) = scope.launch { ) = scope.launch {
val rxCharacteristic = BleServerGattCharacteristicConfig( val rxCharacteristic = ServerBleGattCharacteristicConfig(
UART_RX_CHARACTERISTIC_UUID, UART_RX_CHARACTERISTIC_UUID,
listOf(BleGattProperty.PROPERTY_NOTIFY), listOf(BleGattProperty.PROPERTY_NOTIFY),
listOf() listOf()
) )
val txCharacteristic = BleServerGattCharacteristicConfig( val txCharacteristic = ServerBleGattCharacteristicConfig(
UART_TX_CHARACTERISTIC_UUID, UART_TX_CHARACTERISTIC_UUID,
listOf(BleGattProperty.PROPERTY_INDICATE, BleGattProperty.PROPERTY_WRITE), listOf(BleGattProperty.PROPERTY_INDICATE, BleGattProperty.PROPERTY_WRITE),
listOf(BleGattPermission.PERMISSION_WRITE) listOf(BleGattPermission.PERMISSION_WRITE)
) )
val uartService = BleServerGattServiceConfig( val uartService = ServerBleGattServiceConfig(
UART_SERVICE_UUID, UART_SERVICE_UUID,
BleGattServerServiceType.SERVICE_TYPE_PRIMARY, ServerBleGattServiceType.SERVICE_TYPE_PRIMARY,
listOf(rxCharacteristic, txCharacteristic) listOf(rxCharacteristic, txCharacteristic)
) )
val batteryLevelCharacteristic = BleServerGattCharacteristicConfig( val batteryLevelCharacteristic = ServerBleGattCharacteristicConfig(
BATTERY_LEVEL_CHARACTERISTIC_UUID, BATTERY_LEVEL_CHARACTERISTIC_UUID,
listOf(BleGattProperty.PROPERTY_READ, BleGattProperty.PROPERTY_NOTIFY), listOf(BleGattProperty.PROPERTY_READ, BleGattProperty.PROPERTY_NOTIFY),
listOf(BleGattPermission.PERMISSION_READ) listOf(BleGattPermission.PERMISSION_READ)
) )
val batteryService = BleServerGattServiceConfig( val batteryService = ServerBleGattServiceConfig(
BATTERY_SERVICE_UUID, BATTERY_SERVICE_UUID,
BleGattServerServiceType.SERVICE_TYPE_PRIMARY, ServerBleGattServiceType.SERVICE_TYPE_PRIMARY,
listOf(batteryLevelCharacteristic) listOf(batteryLevelCharacteristic)
) )
server = BleGattServer.create( server = ServerBleGatt.create(
context = context, context = context,
config = arrayOf(uartService, batteryService), config = arrayOf(uartService, batteryService),
mock = device mock = device
) )
val advertiser = BleAdvertiser.create(context) val advertiser = BleAdvertiser.create(context)
advertiser.advertise(config = BleAdvertiseConfig(), mock = device).launchIn(scope) advertiser.advertise(config = BleAdvertisingConfig(), mock = device).launchIn(scope)
launch { launch {
server.connections server.connections
@@ -116,7 +116,7 @@ class UartServer @Inject constructor(
server.stopServer() server.stopServer()
} }
private fun setUpConnection(connection: BluetoothGattServerConnection) { private fun setUpConnection(connection: ServerBluetoothGattConnection) {
// val glsService = connection.services.findService(GLS_SERVICE_UUID)!! // val glsService = connection.services.findService(GLS_SERVICE_UUID)!!
// glsCharacteristic = glsService.findCharacteristic(GLUCOSE_MEASUREMENT_CHARACTERISTIC)!! // glsCharacteristic = glsService.findCharacteristic(GLUCOSE_MEASUREMENT_CHARACTERISTIC)!!
// glsContextCharacteristic = glsService.findCharacteristic(GLUCOSE_MEASUREMENT_CONTEXT_CHARACTERISTIC)!! // glsContextCharacteristic = glsService.findCharacteristic(GLUCOSE_MEASUREMENT_CONTEXT_CHARACTERISTIC)!!
@@ -130,9 +130,8 @@ class UartServer @Inject constructor(
// startBatteryService(connection) // startBatteryService(connection)
} }
private fun startGlsService(connection: BluetoothGattServerConnection) { private fun startGlsService(connection: ServerBluetoothGattConnection) {
racpCharacteristic.value racpCharacteristic.value
.filter { it.isNotEmpty() }
.onEach { lastRequest = it } .onEach { lastRequest = it }
.launchIn(scope) .launchIn(scope)
} }
@@ -141,42 +140,42 @@ class UartServer @Inject constructor(
sendResponse(lastRequest) sendResponse(lastRequest)
} }
private fun sendResponse(request: ByteArray) { private fun sendResponse(request: DataByteArray) {
if (request.contentEquals(RecordAccessControlPointInputParser.reportNumberOfAllStoredRecords().value)) { if (request == RecordAccessControlPointInputParser.reportNumberOfAllStoredRecords()) {
sendAll(glsCharacteristic) sendAll(glsCharacteristic)
racpCharacteristic.setValue(racp) racpCharacteristic.setValue(racp)
} else if (request.contentEquals(RecordAccessControlPointInputParser.reportLastStoredRecord().value)) { } else if (request == RecordAccessControlPointInputParser.reportLastStoredRecord()) {
sendLast(glsCharacteristic) sendLast(glsCharacteristic)
racpCharacteristic.setValue(racp) racpCharacteristic.setValue(racp)
} else if (request.contentEquals(RecordAccessControlPointInputParser.reportFirstStoredRecord().value)) { } else if (request == RecordAccessControlPointInputParser.reportFirstStoredRecord()) {
sendFirst(glsCharacteristic) sendFirst(glsCharacteristic)
racpCharacteristic.setValue(racp) racpCharacteristic.setValue(racp)
} }
} }
private fun sendFirst(characteristics: BleServerGattCharacteristic) { private fun sendFirst(characteristics: ServerBleGattCharacteristic) {
characteristics.setValue(records.first()) characteristics.setValue(records.first())
} }
private fun sendLast(characteristics: BleServerGattCharacteristic) { private fun sendLast(characteristics: ServerBleGattCharacteristic) {
characteristics.setValue(records.last()) characteristics.setValue(records.last())
} }
private fun sendAll(characteristics: BleServerGattCharacteristic) = scope.launch { private fun sendAll(characteristics: ServerBleGattCharacteristic) = scope.launch {
records.forEach { records.forEach {
characteristics.setValue(it) characteristics.setValue(it)
delay(100) delay(100)
} }
} }
private fun startBatteryService(connection: BluetoothGattServerConnection) { private fun startBatteryService(connection: ServerBluetoothGattConnection) {
scope.launch { scope.launch {
repeat(100) { repeat(100) {
batteryLevelCharacteristic.setValue(byteArrayOf(0x61)) batteryLevelCharacteristic.setValue(DataByteArray.from(0x61))
delay(STANDARD_DELAY) delay(STANDARD_DELAY)
batteryLevelCharacteristic.setValue(byteArrayOf(0x60)) batteryLevelCharacteristic.setValue(DataByteArray.from(0x60))
delay(STANDARD_DELAY) delay(STANDARD_DELAY)
batteryLevelCharacteristic.setValue(byteArrayOf(0x5F)) batteryLevelCharacteristic.setValue(DataByteArray.from(0x5F))
delay(STANDARD_DELAY) delay(STANDARD_DELAY)
} }
} }

1
profile_uart/src/test/java/no/nordicsemi/android/gls/UARTViewModelTest.kt
View File

@@ -34,6 +34,7 @@ import no.nordicsemi.android.kotlin.ble.core.MockServerDevice
import no.nordicsemi.android.kotlin.ble.core.data.BleGattConnectionStatus import no.nordicsemi.android.kotlin.ble.core.data.BleGattConnectionStatus
import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionStateWithStatus import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionStateWithStatus
import no.nordicsemi.android.uart.UartServer
import no.nordicsemi.android.uart.data.UARTPersistentDataSource import no.nordicsemi.android.uart.data.UARTPersistentDataSource
import no.nordicsemi.android.uart.repository.UARTRepository import no.nordicsemi.android.uart.repository.UARTRepository
import no.nordicsemi.android.uart.view.DisconnectEvent import no.nordicsemi.android.uart.view.DisconnectEvent