github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

Rename HID classes for clarity

Browse Source
This commit is contained in:
Butterscotch!
2025-09-04 01:34:06 -04:00
parent 41026ab851
commit 44e90e255b
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/android/src/main/java/dev/slimevr/android/Main.kt
View File

@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
import dev.slimevr.Keybinding
import dev.slimevr.VRServer
import dev.slimevr.android.serial.AndroidSerialHandler
import dev.slimevr.android.tracking.trackers.hid.TrackersHID
import dev.slimevr.android.tracking.trackers.hid.AndroidHIDService
import dev.slimevr.tracking.trackers.Tracker
import io.eiren.util.logging.LogManager
import io.ktor.http.CacheControl
@@ -64,12 +64,12 @@ fun main(activity: AppCompatActivity) {
vrServer.start()
// Start service for USB HID trackers
val trackersHid = TrackersHID(
val androidHidService = AndroidHIDService(
"Sensors HID service",
{ tracker: Tracker -> vrServer.registerTracker(tracker) },
activity,
)
trackersHid.start()
androidHidService.start()
Keybinding(vrServer)
vrServer.join()

2
server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/UsbDeviceHID.kt → server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDDevice.kt
View File

@@ -8,7 +8,7 @@ import android.hardware.usb.UsbInterface
import android.hardware.usb.UsbManager
import java.io.Closeable
class UsbDeviceHID(hidDevice: UsbDevice, usbManager: UsbManager) : Closeable {
class AndroidHIDDevice(hidDevice: UsbDevice, usbManager: UsbManager) : Closeable {
val deviceName = hidDevice.deviceName
val serialNumber = hidDevice.serialNumber

6
server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/TrackersHID.kt → server/android/src/main/java/dev/slimevr/android/tracking/trackers/hid/AndroidHIDService.kt
View File

@@ -25,7 +25,7 @@ const val ACTION_USB_PERMISSION = "dev.slimevr.USB_PERMISSION"
/**
* Receives trackers data by UDP using extended owoTrack protocol.
*/
class TrackersHID(
class AndroidHIDService(
name: String,
private val trackersConsumer: Consumer<Tracker>,
private val context: Context,
@@ -33,7 +33,7 @@ class TrackersHID(
private val devices: MutableList<HIDDevice> = mutableListOf()
private val devicesBySerial: MutableMap<String, MutableList<Int>> = HashMap()
private val devicesByHID: MutableMap<UsbDevice, MutableList<Int>> = HashMap()
private val connByHID: MutableMap<UsbDevice, UsbDeviceHID> = HashMap()
private val connByHID: MutableMap<UsbDevice, AndroidHIDDevice> = HashMap()
private val lastDataByHID: MutableMap<UsbDevice, Int> = HashMap()
private val usbManager: UsbManager = context.getSystemService(Context.USB_SERVICE) as UsbManager
@@ -66,7 +66,7 @@ class TrackersHID(
// Close any existing connection (do we still have one?)
this.connByHID[hidDevice]?.close()
// Open new HID connection with USB device
this.connByHID[hidDevice] = UsbDeviceHID(hidDevice, usbManager)
this.connByHID[hidDevice] = AndroidHIDDevice(hidDevice, usbManager)
val serial = hidDevice.serialNumber ?: "Unknown USB Device ${hidDevice.deviceId}"
this.devicesBySerial[serial]?.let {

4
server/desktop/src/main/java/dev/slimevr/desktop/Main.kt
View File

@@ -13,7 +13,7 @@ import dev.slimevr.desktop.platform.linux.UnixSocketBridge
import dev.slimevr.desktop.platform.linux.UnixSocketRpcBridge
import dev.slimevr.desktop.platform.windows.WindowsNamedPipeBridge
import dev.slimevr.desktop.serial.DesktopSerialHandler
import dev.slimevr.desktop.tracking.trackers.hid.TrackersHID
import dev.slimevr.desktop.tracking.trackers.hid.DesktopHIDService
import dev.slimevr.tracking.trackers.Tracker
import io.eiren.util.OperatingSystem
import io.eiren.util.collections.FastList
@@ -132,7 +132,7 @@ fun main(args: Array<String>) {
NetworkProfileChecker(vrServer)
// Start service for USB HID trackers
TrackersHID(
DesktopHIDService(
"Sensors HID service",
) { tracker: Tracker -> vrServer.registerTracker(tracker) }

2
server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/TrackersHID.kt → server/desktop/src/main/java/dev/slimevr/desktop/tracking/trackers/hid/DesktopHIDService.kt
View File

@@ -24,7 +24,7 @@ import java.util.function.Consumer
/**
* Receives trackers data by UDP using extended owoTrack protocol.
*/
class TrackersHID(name: String, private val trackersConsumer: Consumer<Tracker>) :
class DesktopHIDService(name: String, private val trackersConsumer: Consumer<Tracker>) :
Thread(name),
HidServicesListener {
private val devices: MutableList<HIDDevice> = mutableListOf()