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

Improve logging

Browse Source
This commit is contained in:
Sylwester Zielinski
2023-04-03 12:58:30 +02:00
parent c69b8c72a2
commit 9271ee4955
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt
View File

@@ -43,7 +43,6 @@ import kotlinx.coroutines.flow.onEach
import no.nordicsemi.android.analytics.AppAnalytics import no.nordicsemi.android.analytics.AppAnalytics
import no.nordicsemi.android.analytics.ProfileOpenEvent import no.nordicsemi.android.analytics.ProfileOpenEvent
import no.nordicsemi.android.cgms.repository.CGMRepository import no.nordicsemi.android.cgms.repository.CGMRepository
import no.nordicsemi.android.common.logger.NordicBlekLogger
import no.nordicsemi.android.common.logger.NordicLogger import no.nordicsemi.android.common.logger.NordicLogger
import no.nordicsemi.android.common.navigation.DestinationId import no.nordicsemi.android.common.navigation.DestinationId
import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.common.navigation.Navigator

1
profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
View File

@@ -38,7 +38,6 @@ import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import no.nordicsemi.android.common.core.simpleSharedFlow import no.nordicsemi.android.common.core.simpleSharedFlow
import no.nordicsemi.android.common.logger.NordicBlekLogger
import no.nordicsemi.android.kotlin.ble.core.ServerDevice import no.nordicsemi.android.kotlin.ble.core.ServerDevice
import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
import no.nordicsemi.android.service.DisconnectAndStopEvent import no.nordicsemi.android.service.DisconnectAndStopEvent

10
profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt
View File

@@ -33,6 +33,7 @@ package no.nordicsemi.android.uart.repository
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.util.Log
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.filterNotNull
@@ -49,6 +50,7 @@ import no.nordicsemi.android.kotlin.ble.core.ServerDevice
import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty import no.nordicsemi.android.kotlin.ble.core.data.BleGattProperty
import no.nordicsemi.android.kotlin.ble.core.data.BleWriteType import no.nordicsemi.android.kotlin.ble.core.data.BleWriteType
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.Mtu
import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser
import no.nordicsemi.android.service.DEVICE_DATA import no.nordicsemi.android.service.DEVICE_DATA
import no.nordicsemi.android.service.NotificationService import no.nordicsemi.android.service.NotificationService
@@ -106,11 +108,11 @@ internal class UARTService : NotificationService() {
client.services client.services
.filterNotNull() .filterNotNull()
.onEach { configureGatt(it, device) } .onEach { configureGatt(it, device, logger) }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
} }
private suspend fun configureGatt(services: BleGattServices, device: ServerDevice) { private suspend fun configureGatt(services: BleGattServices, device: ServerDevice, logger: NordicBlekLogger) {
val uartService = services.findService(UART_SERVICE_UUID)!! val uartService = services.findService(UART_SERVICE_UUID)!!
val rxCharacteristic = uartService.findCharacteristic(UART_RX_CHARACTERISTIC_UUID)!! val rxCharacteristic = uartService.findCharacteristic(UART_RX_CHARACTERISTIC_UUID)!!
val txCharacteristic = uartService.findCharacteristic(UART_TX_CHARACTERISTIC_UUID)!! val txCharacteristic = uartService.findCharacteristic(UART_TX_CHARACTERISTIC_UUID)!!
@@ -124,13 +126,17 @@ internal class UARTService : NotificationService() {
txCharacteristic.getNotifications() txCharacteristic.getNotifications()
.onEach { repository.onNewMessageReceived(String(it)) } .onEach { repository.onNewMessageReceived(String(it)) }
.onEach { logger.log(10, "Received: ${String(it)}") }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
repository.command repository.command
.onEach { rxCharacteristic.splitWrite(it.toByteArray(), getWriteType(rxCharacteristic)) } .onEach { rxCharacteristic.splitWrite(it.toByteArray(), getWriteType(rxCharacteristic)) }
.onEach { repository.onNewMessageSent(it) } .onEach { repository.onNewMessageSent(it) }
.onEach { logger.log(10, "Sent: $it") }
.launchIn(lifecycleScope) .launchIn(lifecycleScope)
client.requestMtu(Mtu.max)
repository.onInitComplete(device) repository.onInitComplete(device)
} }