Skip to content

Fix: Add multiple CS devices #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
himalia416 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Add multiple CS devices #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion profile/src/main/java/no/nordicsemi/android/toolbox/profile/ProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ internal fun DeviceConnectedView(
when (serviceManager.profile) {
Profile.HTS -> HTSScreen()
Profile.CHANNEL_SOUNDING -> ChannelSoundingScreen(
isNotificationPermissionGranted
deviceId = state.deviceData.peripheral.address,
isNotificationPermissionGranted = isNotificationPermissionGranted
)

Profile.BPS -> BPSScreen()
Expand Down
172 changes: 76 additions & 96 deletions ...o/nordicsemi/android/toolbox/profile/repository/channelSounding/ChannelSoundingManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,81 +46,59 @@ internal class ChannelSoundingManager @Inject constructor(
private val rangingManager: RangingManager? =
context.getSystemService(RangingManager::class.java)
private val _dataMap = mutableMapOf<String, MutableStateFlow<ChannelSoundingServiceData>>()
private var device: String = ""
private lateinit var rangingCapabilityCallback: RangingManager.RangingCapabilitiesCallback
private val _previousRangingDataList = MutableStateFlow<List<Float>>(emptyList())
private var rangingSession: RangingSession? = null
private val _activeSessions = mutableMapOf<String, RangingSession>()
private val _capabilityCallbacks =
mutableMapOf<String, RangingManager.RangingCapabilitiesCallback>()
private val _previousRangingData = mutableMapOf<String, MutableList<Float>>()

private val rangingSessionCallback = @RequiresApi(Build.VERSION_CODES.BAKLAVA)
object : RangingSession.Callback {
override fun onClosed(reason: Int) {
updateRangingData(
device,
RangingSessionAction.OnError(RangingSessionFailedReason.getReason(reason))
)
// Unregister the callback to avoid memory leaks
rangingManager?.unregisterCapabilitiesCallback(rangingCapabilityCallback)
// Cleanup previous data
_previousRangingDataList.value = emptyList()
}

override fun onOpenFailed(reason: Int) {
updateRangingData(
device,
RangingSessionAction.OnError(RangingSessionFailedReason.getReason(reason))
)
// Unregister the callback to avoid memory leaks
rangingManager?.unregisterCapabilitiesCallback(rangingCapabilityCallback)
// Cleanup previous data
_previousRangingDataList.value = emptyList()
}
@RequiresApi(Build.VERSION_CODES.BAKLAVA)
private fun createRangingSessionCallback(deviceAddress: String) =
object : RangingSession.Callback {
override fun onClosed(reason: Int) {
updateRangingData(
deviceAddress,
RangingSessionAction.OnError(RangingSessionFailedReason.getReason(reason))
)
cleanUpDeviceSession(deviceAddress)
}

override fun onOpened() {
updateRangingData(
device,
RangingSessionAction.OnStart
)
}
override fun onOpenFailed(reason: Int) {
updateRangingData(
deviceAddress,
RangingSessionAction.OnError(RangingSessionFailedReason.getReason(reason))
)
cleanUpDeviceSession(deviceAddress)
}

override fun onResults(
peer: RangingDevice,
data: RangingData
) {
val updatedList = _previousRangingDataList.value.toMutableList()
data.distance?.measurement?.let {
updatedList.add(it.toFloat())
override fun onOpened() {
updateRangingData(deviceAddress, RangingSessionAction.OnStart)
}
_previousRangingDataList.value = updatedList
updateRangingData(
device,
RangingSessionAction.OnResult(
data = data.toCsRangingData(),
previousData = _previousRangingDataList.value

override fun onResults(peer: RangingDevice, data: RangingData) {
val history = _previousRangingData.getOrPut(deviceAddress) { mutableListOf() }
data.distance?.measurement?.let {
history.add(it.toFloat())
}

updateRangingData(
deviceAddress,
RangingSessionAction.OnResult(
data = data.toCsRangingData(),
previousData = history.toList()
)
)
)
}
}

override fun onStarted(
peer: RangingDevice,
technology: Int
) {
updateRangingData(device, RangingSessionAction.OnStart)
// Cleanup previous data
_previousRangingDataList.value = emptyList()
}
override fun onStarted(peer: RangingDevice, technology: Int) {
updateRangingData(deviceAddress, RangingSessionAction.OnStart)
_previousRangingData[deviceAddress]?.clear()
}

override fun onStopped(
peer: RangingDevice,
technology: Int
) {
updateRangingData(
device,
RangingSessionAction.OnClosed
)
// Cleanup previous data
_previousRangingDataList.value = emptyList()
override fun onStopped(peer: RangingDevice, technology: Int) {
updateRangingData(deviceAddress, RangingSessionAction.OnClosed)
_previousRangingData[deviceAddress]?.clear()
}
}
}

/**
* Returns a [Flow] of [ChannelSoundingServiceData] for the given device ID.
Expand All @@ -144,17 +122,16 @@ internal class ChannelSoundingManager @Inject constructor(
device: String,
updateRate: UpdateRate = UpdateRate.NORMAL
) {
this.device = device
if (rangingManager == null) {
updateRangingData(
device,
RangingSessionAction.OnError(SessionClosedReason.RANGING_NOT_AVAILABLE)
)
return
}
// If session is already active then continue the session, otherwise create a new one
if (rangingSession != null) {
Timber.w("Ranging session already active.")
// If session is already active for the device then continue the session, otherwise create a new one.
if (_activeSessions.containsKey(device)) {
Timber.w("Ranging session already active for device: $device")
return
}
val setRangingUpdateRate = when (updateRate) {
Expand Down Expand Up @@ -199,25 +176,23 @@ internal class ChannelSoundingManager @Inject constructor(
.setSessionConfig(sessionConfig)
.build()

rangingCapabilityCallback = RangingManager.RangingCapabilitiesCallback { capabilities ->
val rangingCapabilityCallback = RangingManager.RangingCapabilitiesCallback { capabilities ->
if (capabilities.csCapabilities != null) {
if (capabilities.csCapabilities!!.supportedSecurityLevels.contains(1)) {
// Channel Sounding supported
// Check if Ranging Permission is granted before starting the session
if (hasRangingPermissions(context)) {
rangingSession = rangingManager.createRangingSession(

val session = rangingManager.createRangingSession(
context.mainExecutor,
rangingSessionCallback
createRangingSessionCallback(device) // Dynamic device callback
)
rangingSession?.let {

session?.let {
try {
_activeSessions[device] = it
it.addDeviceToRangingSession(rawRangingDeviceConfig)
} catch (e: Exception) {
Timber.e("Failed to add device to ranging session: ${e.message}")
updateRangingData(
device,
RangingSessionAction.OnClosed
)
updateRangingData(device, RangingSessionAction.OnClosed)
} finally {
it.start(rangingPreference)
}
Expand All @@ -231,9 +206,7 @@ internal class ChannelSoundingManager @Inject constructor(
} else {
updateRangingData(
device,
RangingSessionAction.OnError(
SessionClosedReason.MISSING_PERMISSION
)
RangingSessionAction.OnError(SessionClosedReason.MISSING_PERMISSION)
)
return@RangingCapabilitiesCallback
}
Expand All @@ -251,13 +224,10 @@ internal class ChannelSoundingManager @Inject constructor(
)
closeSession(device)
}

}

rangingManager.registerCapabilitiesCallback(
context.mainExecutor,
rangingCapabilityCallback
)
_capabilityCallbacks[device] = rangingCapabilityCallback
rangingManager.registerCapabilitiesCallback(context.mainExecutor, rangingCapabilityCallback)
}

/**
Expand All @@ -274,34 +244,45 @@ internal class ChannelSoundingManager @Inject constructor(
deviceAddress: String,
onClosed: (suspend () -> Unit)? = null
) {
val session = rangingSession ?: return
val session = _activeSessions[deviceAddress] ?: return
CoroutineScope(Dispatchers.IO).launch {
try {
onClosed ?.let {
onClosed?.let {
updateRangingData(deviceAddress, RangingSessionAction.OnRestarting)
}
session.stop()
// Wait for onStopped() or onClosed() before closing
delay(1000) // Give the system time to propagate onStopped
withContext(Dispatchers.Main) {
session.close()
rangingSession = null
rangingManager?.unregisterCapabilitiesCallback(rangingCapabilityCallback)
cleanUpDeviceSession(deviceAddress)
delay(1500)
onClosed?.let { it() } ?: run {
clear(deviceAddress)
}
}
} catch (e: Exception) {
Timber.e(e, "Error closing ranging session")
Timber.e(e, "Error closing ranging session for $deviceAddress")
updateRangingData(
device,
deviceAddress,
RangingSessionAction.OnError(SessionClosedReason.UNKNOWN)
)
}
}
}

/**
* Shared helper to cleanly tear down session maps for a specific device.
*/
@RequiresApi(Build.VERSION_CODES.BAKLAVA)
private fun cleanUpDeviceSession(deviceAddress: String) {
_activeSessions.remove(deviceAddress)
_previousRangingData.remove(deviceAddress)
_capabilityCallbacks.remove(deviceAddress)?.let { callback ->
rangingManager?.unregisterCapabilitiesCallback(callback)
}
}

/**
* Checks if the app has the RANGING permission.
* Requires Android version Baklava (API 36) or higher.
Expand Down Expand Up @@ -353,4 +334,3 @@ internal class ChannelSoundingManager @Inject constructor(
_dataMap[address]?.update { it.copy(interval = interval) }

}

18 changes: 13 additions & 5 deletions .../java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,27 @@ import no.nordicsemi.android.ui.view.TextWithAnimatedDots
import no.nordicsemi.android.ui.view.internal.LoadingView

@Composable
internal fun ChannelSoundingScreen(isNotificationPermissionGranted: Boolean?) {
internal fun ChannelSoundingScreen(
deviceId: String,
isNotificationPermissionGranted: Boolean?,
) {
// Channel Sounding is available from Android 16 (API 36) onward, while better accuracy and
// performance are provided from Android 16 (API 36, minor version 1) and later.
if (Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1 && isNotificationPermissionGranted != null) {
RequestRangingPermission {
val channelSoundingViewModel = hiltViewModel<ChannelSoundingViewModel>()
val channelSoundingState by channelSoundingViewModel.channelSoundingState.collectAsStateWithLifecycle()
val onClickEvent: (event: ChannelSoundingEvent) -> Unit =
{ channelSoundingViewModel.onEvent(it) }
val channelSoundingMapState by channelSoundingViewModel.channelSoundingState.collectAsStateWithLifecycle()
val channelSoundingState =
channelSoundingMapState[deviceId] ?: ChannelSoundingServiceData()

val onClickEvent: (event: ChannelSoundingEvent) -> Unit = {
channelSoundingViewModel.onEvent(it)
}

ChannelSoundingView(channelSoundingState, onClickEvent)
}
} else if (Build.VERSION.SDK_INT_FULL == Build.VERSION_CODES_FULL.BAKLAVA && isNotificationPermissionGranted != null) {
// It supports the Channel Sounding but we are intentionally not enabling it because of the accuracy and performance issues.
// It supports the Channel Sounding, but we are intentionally not enabling it because of the accuracy and performance issues.
ChannelSoundingNotEnabledView()
} else {
ChannelSoundingNotSupportedView()
Expand Down
Loading