diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt index bcb7e1e9..a23f0075 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt @@ -130,7 +130,7 @@ internal class BPSViewModel @Inject constructor( .onEach { logAnalytics(it.state) } .launchIn(viewModelScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it) } .launchIn(viewModelScope) diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt index fd25f815..da8209fd 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMService.kt @@ -146,7 +146,7 @@ internal class CGMService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it) } .launchIn(lifecycleScope) diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt index fc357958..af557a69 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCService.kt @@ -102,7 +102,7 @@ internal class CSCService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(lifecycleScope) diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt index 03fd40e3..dfd1badc 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt @@ -168,7 +168,7 @@ internal class GLSViewModel @Inject constructor( .onEach { logAnalytics(it) } .launchIn(viewModelScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(viewModelScope) diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt index 5248a3c4..d9600c3e 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSService.kt @@ -104,7 +104,7 @@ internal class HRSService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(lifecycleScope) diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt index 3fe6d797..65c04460 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSService.kt @@ -102,7 +102,7 @@ internal class HTSService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(lifecycleScope) diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt index 9de087b6..3770db68 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXService.kt @@ -172,7 +172,7 @@ internal class PRXService : NotificationService() { .onEach { stopIfDisconnected(it.state, it.status) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(lifecycleScope) diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt index a3cc54cd..dbe7e2b9 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt @@ -102,7 +102,7 @@ internal class RSCSService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device) } .launchIn(lifecycleScope) diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt index 44303127..6e66c785 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTService.kt @@ -97,6 +97,10 @@ internal class UARTService : NotificationService() { client = device.connect(this@UARTService, logger = logger) + Log.d("AAATESTAAA","connect finish") + + client.requestMtu(Mtu.max) + repository.loggerEvent .onEach { logger.launch() } .launchIn(lifecycleScope) @@ -107,7 +111,7 @@ internal class UARTService : NotificationService() { .onEach { stopIfDisconnected(it) } .launchIn(lifecycleScope) - client.services + client.discoverServices() .filterNotNull() .onEach { configureGatt(it, device, logger) } .launchIn(lifecycleScope) @@ -136,7 +140,7 @@ internal class UARTService : NotificationService() { .onEach { logger.log(10, "Sent: $it") } .launchIn(lifecycleScope) - client.requestMtu(Mtu.max) + repository.onInitComplete(device) }