diff --git a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt index 15c57214e..0f54763b4 100644 --- a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt @@ -340,6 +340,7 @@ class SensorInfoBehaviour : UDPConnectionBehaviour { override fun observe(receiver: UDPConnection) { receiver.packetEvents.onPacket { event -> val device = receiver.getDevice() ?: error("invalid state - a device should exist at this point") + receiver.send(SensorInfoAck(sensorId = event.data.sensorId, status = event.data.status)) val existingTracker = receiver.getTracker(event.data.sensorId) if (existingTracker != null) { diff --git a/server/core/src/main/java/dev/slimevr/udp/packets.kt b/server/core/src/main/java/dev/slimevr/udp/packets.kt index 1b44b51cd..0053d344e 100644 --- a/server/core/src/main/java/dev/slimevr/udp/packets.kt +++ b/server/core/src/main/java/dev/slimevr/udp/packets.kt @@ -350,6 +350,19 @@ data class SensorInfo( } } +data class SensorInfoAck(override val sensorId: Int, val status: TrackerStatus) : SensorSpecificPacket { + override fun write(dst: Sink) { + dst.writeUByte(sensorId.toUByte()) + dst.writeUByte( + when (status) { + TrackerStatus.OK -> 1u + TrackerStatus.ERROR -> 2u + else -> 0u + }, + ) + } +} + data class Rotation2(override val sensorId: Int = 1, val rotation: Quaternion = Quaternion.IDENTITY) : SensorSpecificPacket { companion object { fun read(src: Source) = Rotation2(1, src.readSafeQuat()) @@ -520,14 +533,20 @@ fun writePacket(dst: Sink, packet: UDPPacket) { is Handshake -> PacketType.HANDSHAKE is PingPong -> PacketType.PING_PONG is SetConfigFlag -> PacketType.SET_CONFIG_FLAG + is SensorInfoAck -> PacketType.SENSOR_INFO is ProtocolChange -> PacketType.PROTOCOL_CHANGE is FeatureFlags -> PacketType.FEATURE_FLAGS else -> throw UnsupportedOperationException("Outbound support not implemented for ${packet::class.simpleName}") } - if (type != PacketType.HANDSHAKE) { - dst.writeInt(type.id) - dst.writeLong(0) + when (type) { + PacketType.HANDSHAKE -> Unit + PacketType.SENSOR_INFO -> dst.writeInt(type.id) + + else -> { + dst.writeInt(type.id) + dst.writeLong(0) + } } packet.write(dst) }