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

Serialize imput messages

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-05-10 11:16:51 +02:00
parent 10a727313c
commit 8a33ee16fc
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTData.kt
View File

@@ -5,7 +5,7 @@ internal data class UARTData(
val batteryLevel: Int? = null, val batteryLevel: Int? = null,
) { ) {
val displayMessages = messages.take(50) val displayMessages = messages
} }
internal data class UARTRecord( internal data class UARTRecord(

35
profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
View File

@@ -29,9 +29,9 @@ import android.content.Context
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.*
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.withContext
import no.nordicsemi.android.ble.BleManager import no.nordicsemi.android.ble.BleManager
import no.nordicsemi.android.ble.WriteRequest import no.nordicsemi.android.ble.WriteRequest
import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
@@ -49,7 +49,8 @@ private val UART_RX_CHARACTERISTIC_UUID = UUID.fromString("6E400002-B5A3-F393-E0
private val UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E") private val UART_TX_CHARACTERISTIC_UUID = UUID.fromString("6E400003-B5A3-F393-E0A9-E50E24DCCA9E")
private val BATTERY_SERVICE_UUID = UUID.fromString("0000180F-0000-1000-8000-00805f9b34fb") private val BATTERY_SERVICE_UUID = UUID.fromString("0000180F-0000-1000-8000-00805f9b34fb")
private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1000-8000-00805f9b34fb") private val BATTERY_LEVEL_CHARACTERISTIC_UUID =
UUID.fromString("00002A19-0000-1000-8000-00805f9b34fb")
internal class UARTManager( internal class UARTManager(
context: Context, context: Context,
@@ -87,16 +88,23 @@ internal class UARTManager(
@SuppressLint("WrongConstant") @SuppressLint("WrongConstant")
override fun initialize() { override fun initialize() {
setNotificationCallback(txCharacteristic).asFlow().onEach { setNotificationCallback(txCharacteristic).asFlow()
.flowOn(Dispatchers.IO)
.map {
val text: String = it.getStringValue(0) ?: String.EMPTY val text: String = it.getStringValue(0) ?: String.EMPTY
log(10, "\"$text\" received") log(10, "\"$text\" received")
data.value = data.value.copy(messages = data.value.messages + UARTRecord(text, UARTRecordType.OUTPUT)) val messages = data.value.messages + UARTRecord(text, UARTRecordType.OUTPUT)
messages.takeLast(50)
}
.onEach {
data.value = data.value.copy(messages = it)
}.launchIn(scope) }.launchIn(scope)
requestMtu(517).enqueue() requestMtu(517).enqueue()
enableNotifications(txCharacteristic).enqueue() enableNotifications(txCharacteristic).enqueue()
setNotificationCallback(batteryLevelCharacteristic).asValidResponseFlow<BatteryLevelResponse>().onEach { setNotificationCallback(batteryLevelCharacteristic).asValidResponseFlow<BatteryLevelResponse>()
.onEach {
data.value = data.value.copy(batteryLevel = it.batteryLevel) data.value = data.value.copy(batteryLevel = it.batteryLevel)
}.launchIn(scope) }.launchIn(scope)
enableNotifications(batteryLevelCharacteristic).enqueue() enableNotifications(batteryLevelCharacteristic).enqueue()
@@ -114,7 +122,8 @@ internal class UARTManager(
rxCharacteristic?.let { rxCharacteristic?.let {
val rxProperties: Int = it.properties val rxProperties: Int = it.properties
writeRequest = rxProperties and BluetoothGattCharacteristic.PROPERTY_WRITE > 0 writeRequest = rxProperties and BluetoothGattCharacteristic.PROPERTY_WRITE > 0
writeCommand = rxProperties and BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE > 0 writeCommand =
rxProperties and BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE > 0
// Set the WRITE REQUEST type when the characteristic supports it. // Set the WRITE REQUEST type when the characteristic supports it.
// This will allow to send long write (also if the characteristic support it). // This will allow to send long write (also if the characteristic support it).
@@ -148,12 +157,18 @@ internal class UARTManager(
} else { } else {
BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
} }
val request: WriteRequest = writeCharacteristic(rxCharacteristic, text.toByteArray(), writeType) val request: WriteRequest =
writeCharacteristic(rxCharacteristic, text.toByteArray(), writeType)
if (!useLongWrite) { if (!useLongWrite) {
request.split() request.split()
} }
request.suspend() request.suspend()
data.value = data.value.copy(messages = data.value.messages + UARTRecord(text, UARTRecordType.INPUT)) data.value = data.value.copy(
messages = data.value.messages + UARTRecord(
text,
UARTRecordType.INPUT
)
)
log(10, "\"$text\" sent") log(10, "\"$text\" sent")
} }
} }