Skip to content

Change UDP tracker status to OK from TIMED_OUT on rotation/accel update #1923

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
ImSapphire wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

Change UDP tracker status to OK from TIMED_OUT on rotation/accel update #1923

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
12 changes: 9 additions & 3 deletions server/core/src/main/java/dev/slimevr/tracking/trackers/udp/TrackersUDPServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,9 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
var rot = packet.rotation
rot = AXES_OFFSET.times(rot)
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
tracker.setRotation(rot)
if (packet is UDPPacket23RotationAndAcceleration) {
// sensorOffset is applied correctly since protocol 22
Expand All @@ -422,7 +424,9 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker

is UDPPacket17RotationData -> {
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
var rot17 = packet.rotation
rot17 = AXES_OFFSET * rot17
when (packet.dataType) {
Expand All @@ -446,7 +450,9 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker

is UDPPacket4Acceleration -> {
val tracker = connection?.getTracker(packet.sensorId) ?: return
if (tracker.status == TrackerStatus.DISCONNECTED) tracker.status = TrackerStatus.OK
if (tracker.status == TrackerStatus.DISCONNECTED || tracker.status == TrackerStatus.TIMED_OUT) {
tracker.status = TrackerStatus.OK
}
// sensorOffset is applied correctly since protocol 22
// See: https://github.com/SlimeVR/SlimeVR-Tracker-ESP/pull/480
if (connection.protocolVersion >= 22) {
Expand Down
Loading