mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-21 17:41:28 -08:00
HIDManager extend HIDCommon
This commit is contained in:
1 parent
bed38b9f2d
commit
dcd2d131d3
5 files changed
+9
-6
No files matched your search
@@ -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()
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ class AndroidHIDManager(
|
||||
name: String,
|
||||
private val trackersConsumer: Consumer<Tracker>,
|
||||
private val context: Context,
|
||||
) : Thread(name) {
|
||||
) : HIDCommon(name) {
|
||||
private val devices: MutableList<HIDDevice> = mutableListOf()
|
||||
private val devicesBySerial: MutableMap<String, MutableList<Int>> = HashMap()
|
||||
private val devicesByHID: MutableMap<UsbDevice, MutableList<Int>> = HashMap()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -135,7 +135,8 @@ fun main(args: Array<String>) {
|
||||
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) }
|
||||
|
||||
|
||||
+1
-1
@@ -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<Tracker>) :
|
||||
Thread(name),
|
||||
HIDCommon(name),
|
||||
HidServicesListener {
|
||||
private val devices: MutableList<HIDDevice> = mutableListOf()
|
||||
private val devicesBySerial: MutableMap<String, MutableList<Int>> = HashMap()
|
||||
|
||||
Reference in new issue
Block a user