From ff514faf735cf373a92b36d85d5ae68b2ff35700 Mon Sep 17 00:00:00 2001 From: Erimel Date: Thu, 16 Jul 2026 18:22:53 -0400 Subject: [PATCH] Use trackerRole as protocol serial --- server/core/src/main/java/dev/slimevr/driver/behaviours.kt | 1 - server/core/src/main/java/dev/slimevr/driver/module.kt | 2 +- .../src/main/java/dev/slimevr/desktop/ipc/protocol.kt | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt index 4689344c6..2975e2de1 100644 --- a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt @@ -40,7 +40,6 @@ class DriverOutgoingTrackersBehaviour : DriverBridgeBehaviour { DriverBridgeOutbound.TrackerAdded( trackerId = part.value.toInt(), part = part, - serial = closestTracker.hardwareId, name = closestTracker.customName ?: closestTracker.name, manufacturer = closestDevice.manufacturer, ), diff --git a/server/core/src/main/java/dev/slimevr/driver/module.kt b/server/core/src/main/java/dev/slimevr/driver/module.kt index 55ac063f5..3ba52421d 100644 --- a/server/core/src/main/java/dev/slimevr/driver/module.kt +++ b/server/core/src/main/java/dev/slimevr/driver/module.kt @@ -32,7 +32,7 @@ sealed interface DriverBridgeInbound { } sealed interface DriverBridgeOutbound { - data class TrackerAdded(val trackerId: Int, val part: BodyPart, val serial: String, val name: String, val manufacturer: String) : DriverBridgeOutbound + data class TrackerAdded(val trackerId: Int, val part: BodyPart, val name: String, val manufacturer: String) : DriverBridgeOutbound data class TrackerStatus(val trackerId: Int, val status: solarxr_protocol.datatypes.TrackerStatus, val battery: Float?, val charging: Boolean) : DriverBridgeOutbound data class TrackerPosition(val trackerId: Int, val rotation: Quaternion, val position: Vector3?) : DriverBridgeOutbound } diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt b/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt index 5ef2140c2..bb3c1b322 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/ipc/protocol.kt @@ -139,13 +139,14 @@ suspend fun handleDriverConnection( ) bridge.outbound.on { event -> + val trackerRole = bodyPartToRole.getOrDefault(event.part, TrackerRole.NONE) sendMsg( ProtobufMessage( tracker_added = TrackerAdded( tracker_id = event.trackerId, - tracker_serial = event.serial, + tracker_serial = "human://${trackerRole}", tracker_name = event.name, - tracker_role = bodyPartToRole.getOrDefault(event.part, TrackerRole.NONE).value.toInt(), + tracker_role = trackerRole.value.toInt(), manufacturer = event.manufacturer, ), ),