mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-21 17:41:28 -08:00
Use trackerRole as protocol serial
This commit is contained in:
1 parent
35175565d3
commit
ff514faf73
3 files changed
+4
-4
No files matched your search
@@ -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,
|
||||
),
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -139,13 +139,14 @@ suspend fun handleDriverConnection(
|
||||
)
|
||||
|
||||
bridge.outbound.on<DriverBridgeOutbound.TrackerAdded> { 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,
|
||||
),
|
||||
),
|
||||
|
||||
Reference in new issue
Block a user