diff --git a/server/android/src/main/java/dev/slimevr/android/Main.kt b/server/android/src/main/java/dev/slimevr/android/Main.kt index 686644560..0e9a9f752 100644 --- a/server/android/src/main/java/dev/slimevr/android/Main.kt +++ b/server/android/src/main/java/dev/slimevr/android/Main.kt @@ -47,12 +47,13 @@ fun startVRServer(activity: AppCompatActivity) { vrServer.start() // Start service for USB HID trackers - val androidHidManager = AndroidHIDManager( + LogManager.info("Starting the HID tracker service") + vrServer.hidTrackersServer = AndroidHIDManager( "Sensors HID service", { tracker: Tracker -> vrServer.registerTracker(tracker) }, activity, ) - androidHidManager.start() + vrServer.hidTrackersServer.start() Keybinding(vrServer) vrServer.join() diff --git a/server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDManager.kt b/server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDManager.kt index 22b537a90..87233f230 100644 --- a/server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDManager.kt +++ b/server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDManager.kt @@ -32,7 +32,7 @@ class AndroidHIDManager( name: String, private val trackersConsumer: Consumer, private val context: Context, -) : Thread(name) { +) : HIDCommon(name) { private val devices: MutableList = mutableListOf() private val devicesBySerial: MutableMap> = HashMap() private val devicesByHID: MutableMap> = HashMap() diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt index b1be8d133..9f8cb90c2 100644 --- a/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt +++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/hid/HIDCommon.kt @@ -23,7 +23,8 @@ import kotlin.math.sqrt /** * A collection of shared HID functions between OS specific HID implementations. */ -class HIDCommon { +open class HIDCommon(name: String) : + Thread(name) { companion object { const val HID_TRACKER_RECEIVER_VID = 0x1209 const val HID_TRACKER_RECEIVER_PID = 0x7690 diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt index 22267c260..232cb0b4e 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt @@ -135,7 +135,8 @@ fun main(args: Array) { vrServer.start() // Start service for USB HID trackers - DesktopHIDManager( + LogManager.info("Starting the HID tracker service") + vrServer.hidTrackersServer = DesktopHIDManager( "Sensors HID service", ) { tracker: Tracker -> vrServer.registerTracker(tracker) } diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/DesktopHIDManager.kt b/server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/DesktopHIDManager.kt index 3f89940a1..feda15917 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/DesktopHIDManager.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/DesktopHIDManager.kt @@ -28,7 +28,7 @@ import java.util.function.Consumer * Handles desktop USB HID dongles and receives tracker data from them. */ class DesktopHIDManager(name: String, private val trackersConsumer: Consumer) : - Thread(name), + HIDCommon(name), HidServicesListener { private val devices: MutableList = mutableListOf() private val devicesBySerial: MutableMap> = HashMap()