Compare commits

..
15 changed files with 99 additions and 406 deletions

No files matched your search

+1 -2
View File
@@ -13,8 +13,7 @@
"Area: GUI":
- all:
- changed-files:
- any-glob-to-any-file: "gui/**/*"
- all-globs-to-all-files: "!gui/public/i18n/**"
- all-globs-to-any-files: ["gui/**/*", "!gui/public/i18n/**/*"]
"Area: Hardware Protocol":
- changed-files:
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/tracking/trackers/udp/**"
-1
View File
@@ -214,7 +214,6 @@ tracker-infos-url = Tracker URL
tracker-infos-version = Firmware Version
tracker-infos-hardware_rev = Hardware Revision
tracker-infos-hardware_identifier = Hardware ID
tracker-infos-data_support = Data support
tracker-infos-imu = IMU Sensor
tracker-infos-board_type = Main board
tracker-infos-network_version = Protocol Version
@@ -11,7 +11,6 @@ import {
ImuType,
MagnetometerStatus,
RpcMessage,
TrackerDataType,
} from 'solarxr-protocol';
import { useDebouncedEffect } from '@/hooks/timeout';
import { useTrackerFromId } from '@/hooks/tracker';
@@ -261,16 +260,6 @@ export function TrackerSettingsPage() {
{tracker?.device?.hardwareInfo?.hardwareIdentifier || '--'}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-data_support')}
</Typography>
<Typography>
{tracker?.tracker.info?.dataSupport
? TrackerDataType[tracker?.tracker.info?.dataSupport]
: '--'}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-imu')}
@@ -59,7 +59,7 @@ public class DataFeedBuilder {
)
);
HardwareInfo.addNetworkProtocolVersion(fbb, udpDevice.protocolVersion);
HardwareInfo.addNetworkProtocolVersion(fbb, udpDevice.firmwareBuild);
}
// BRUH MOMENT
@@ -142,8 +142,6 @@ public class DataFeedBuilder {
TrackerInfo.addMagnetometer(fbb, tracker.getMagStatus().getSolarType());
TrackerInfo.addIsHmd(fbb, tracker.isHmd());
TrackerInfo.addDataSupport(fbb, tracker.getTrackerDataType().getSolarType());
return TrackerInfo.endTrackerInfo(fbb);
}
@@ -12,7 +12,6 @@ import dev.slimevr.tracking.trackers.TrackerPosition
import dev.slimevr.tracking.trackers.TrackerRole
import dev.slimevr.tracking.trackers.TrackerUtils.getFirstAvailableTracker
import dev.slimevr.tracking.trackers.TrackerUtils.getTrackerForSkeleton
import dev.slimevr.tracking.trackers.udp.TrackerDataType
import dev.slimevr.util.ann.VRServerThread
import io.eiren.util.ann.ThreadSafe
import io.eiren.util.collections.FastList
@@ -589,7 +588,7 @@ class HumanSkeleton(
// Left thumb
updateFingerTransforms(
leftHandTrackerBone.getGlobalRotation(),
leftHandBone.getGlobalRotation(),
leftThumbProximalBone,
leftThumbIntermediateBone,
leftThumbDistalBone,
@@ -600,7 +599,7 @@ class HumanSkeleton(
// Left index
updateFingerTransforms(
leftHandTrackerBone.getGlobalRotation(),
leftHandBone.getGlobalRotation(),
leftIndexProximalBone,
leftIndexIntermediateBone,
leftIndexDistalBone,
@@ -611,7 +610,7 @@ class HumanSkeleton(
// Left middle
updateFingerTransforms(
leftHandTrackerBone.getGlobalRotation(),
leftHandBone.getGlobalRotation(),
leftMiddleProximalBone,
leftMiddleIntermediateBone,
leftMiddleDistalBone,
@@ -622,7 +621,7 @@ class HumanSkeleton(
// Left ring
updateFingerTransforms(
leftHandTrackerBone.getGlobalRotation(),
leftHandBone.getGlobalRotation(),
leftRingProximalBone,
leftRingIntermediateBone,
leftRingDistalBone,
@@ -633,7 +632,7 @@ class HumanSkeleton(
// Left little
updateFingerTransforms(
leftHandTrackerBone.getGlobalRotation(),
leftHandBone.getGlobalRotation(),
leftLittleProximalBone,
leftLittleIntermediateBone,
leftLittleDistalBone,
@@ -644,7 +643,7 @@ class HumanSkeleton(
// Right thumb
updateFingerTransforms(
rightHandTrackerBone.getGlobalRotation(),
rightHandBone.getGlobalRotation(),
rightThumbProximalBone,
rightThumbIntermediateBone,
rightThumbDistalBone,
@@ -655,7 +654,7 @@ class HumanSkeleton(
// Right index
updateFingerTransforms(
rightHandTrackerBone.getGlobalRotation(),
rightHandBone.getGlobalRotation(),
rightIndexProximalBone,
rightIndexIntermediateBone,
rightIndexDistalBone,
@@ -666,7 +665,7 @@ class HumanSkeleton(
// Right middle
updateFingerTransforms(
rightHandTrackerBone.getGlobalRotation(),
rightHandBone.getGlobalRotation(),
rightMiddleProximalBone,
rightMiddleIntermediateBone,
rightMiddleDistalBone,
@@ -677,7 +676,7 @@ class HumanSkeleton(
// Right ring
updateFingerTransforms(
rightHandTrackerBone.getGlobalRotation(),
rightHandBone.getGlobalRotation(),
rightRingProximalBone,
rightRingIntermediateBone,
rightRingDistalBone,
@@ -688,7 +687,7 @@ class HumanSkeleton(
// Right little
updateFingerTransforms(
rightHandTrackerBone.getGlobalRotation(),
rightHandBone.getGlobalRotation(),
rightLittleProximalBone,
rightLittleIntermediateBone,
rightLittleDistalBone,
@@ -1041,45 +1040,21 @@ class HumanSkeleton(
// Note: we use interpQ instead of interpR in order to slerp over 180 degrees.
// Start of finger
proximalTracker?.let {
val fingerRot = if (it.trackerDataType == TrackerDataType.FLEX_RESISTANCE ||
it.trackerDataType == TrackerDataType.FLEX_ANGLE
) {
handRotation * it.getRotation()
} else {
it.getRotation()
}
proximalBone.setRotation(fingerRot)
if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(fingerRot, 2.12f))
if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(fingerRot, 3.03f))
proximalBone.setRotation(it.getRotation())
if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(it.getRotation(), 2.12f))
if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(it.getRotation(), 3.03f))
}
// Middle of finger
intermediateTracker?.let {
val fingerRot = if (it.trackerDataType == TrackerDataType.FLEX_RESISTANCE ||
it.trackerDataType == TrackerDataType.FLEX_ANGLE
) {
handRotation * it.getRotation()
} else {
it.getRotation()
}
if (proximalTracker == null) proximalBone.setRotation(handRotation.interpQ(fingerRot, 0.47f))
intermediateBone.setRotation(fingerRot)
if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(fingerRot, 1.43f))
if (proximalTracker == null) proximalBone.setRotation(handRotation.interpQ(it.getRotation(), 0.47f))
intermediateBone.setRotation(it.getRotation())
if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(it.getRotation(), 1.43f))
}
// Tip of finger
distalTracker?.let {
val fingerRot = if (it.trackerDataType == TrackerDataType.FLEX_RESISTANCE ||
it.trackerDataType == TrackerDataType.FLEX_ANGLE
) {
handRotation * it.getRotation()
} else {
it.getRotation()
}
if (proximalTracker == null && intermediateTracker == null) proximalBone.setRotation(handRotation.interpQ(fingerRot, 0.33f))
if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(fingerRot, 0.7f))
distalBone.setRotation(fingerRot)
if (proximalTracker == null && intermediateTracker == null) proximalBone.setRotation(handRotation.interpQ(it.getRotation(), 0.33f))
if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(it.getRotation(), 0.7f))
distalBone.setRotation(it.getRotation())
}
}
@@ -5,7 +5,6 @@ import dev.slimevr.config.TrackerConfig
import dev.slimevr.tracking.trackers.TrackerPosition.Companion.getByDesignation
import dev.slimevr.tracking.trackers.udp.IMUType
import dev.slimevr.tracking.trackers.udp.MagnetometerStatus
import dev.slimevr.tracking.trackers.udp.TrackerDataType
import io.eiren.util.BufferedTimer
import io.github.axisangles.ktmath.Quaternion
import io.github.axisangles.ktmath.Vector3
@@ -68,11 +67,6 @@ class Tracker @JvmOverloads constructor(
val needsMounting: Boolean = false,
val isHmd: Boolean = false,
magStatus: MagnetometerStatus = MagnetometerStatus.NOT_SUPPORTED,
/**
* Rotation by default.
* NOT the same as hasRotation (other data types emulate rotation)
*/
val trackerDataType: TrackerDataType = TrackerDataType.ROTATION,
) {
private val timer = BufferedTimer(1f)
private var timeAtLastUpdate: Long = System.currentTimeMillis()
@@ -81,7 +75,6 @@ class Tracker @JvmOverloads constructor(
var position = Vector3.NULL
val resetsHandler: TrackerResetsHandler = TrackerResetsHandler(this)
val filteringHandler: TrackerFilteringHandler = TrackerFilteringHandler()
val trackerFlexHandler: TrackerFlexHandler = TrackerFlexHandler(this)
var batteryVoltage: Float? = null
var batteryLevel: Float? = null
var ping: Int? = null
@@ -157,7 +150,7 @@ class Tracker @JvmOverloads constructor(
fun checkReportRequireReset() {
if (needsReset && trackerPosition != null && lastResetStatus == 0u &&
!status.reset && (isImu() || !statusResetRecently && trackerDataType != TrackerDataType.FLEX_ANGLE)
!status.reset && (isImu() || !statusResetRecently)
) {
reportRequireReset()
} else if (lastResetStatus != 0u && (trackerPosition == null || status.reset)) {
@@ -335,7 +328,7 @@ class Tracker @JvmOverloads constructor(
}
// Reset if needed and is not computed and internal
if (needsReset && !(isComputed && isInternal) && trackerDataType == TrackerDataType.ROTATION) {
if (needsReset && !(isComputed && isInternal)) {
// Adjust to reset, mounting and drift compensation
rot = resetsHandler.getReferenceAdjustedDriftRotationFrom(rot)
}
@@ -367,7 +360,7 @@ class Tracker @JvmOverloads constructor(
}
// Reset if needed or is a computed tracker besides head
if (needsReset && !(isComputed && trackerPosition != TrackerPosition.HEAD) && trackerDataType == TrackerDataType.ROTATION) {
if (needsReset && !(isComputed && trackerPosition != TrackerPosition.HEAD)) {
// Adjust to reset and mounting
rot = resetsHandler.getIdentityAdjustedDriftRotationFrom(rot)
}
@@ -395,11 +388,7 @@ class Tracker @JvmOverloads constructor(
this._acceleration = vec
}
/**
* True if the raw rotation is coming directly from an IMU (no cameras or lighthouses)
* For example, flex sensor trackers are not considered as IMU trackers (see TrackerDataType)
*/
fun isImu(): Boolean = imuType != null && trackerDataType == TrackerDataType.ROTATION
fun isImu(): Boolean = imuType != null
/**
* Please don't use this and instead set it via [Device.setMag]
@@ -1,176 +0,0 @@
package dev.slimevr.tracking.trackers
import com.jme3.math.FastMath
import io.github.axisangles.ktmath.EulerAngles
import io.github.axisangles.ktmath.EulerOrder
import kotlin.math.*
/**
* Class handling flex sensor data (angle and resistance)
* Resistance is expected to go up with bend by default, but a mounting reset allows the contrary
*/
class TrackerFlexHandler(val tracker: Tracker) {
private var minResistance = Float.MIN_VALUE
private var maxResistance = Float.MAX_VALUE
// Used to support resistance going both ways.
// Default is higher = more bend, but can change after a full and mounting reset.
private var lastMinResetResistance = Float.MIN_VALUE
private var resistanceReversed = false
private var lastResistance = 0f
private val thumbInitialOffset = FastMath.PI / 8 // 22.5 deg
/**
* Resets the min resistance from the last resistance value received.
* Triggered from full reset
*/
fun resetMin() {
minResistance = lastResistance
lastMinResetResistance = lastResistance
setFlexResistance(lastResistance)
tracker.dataTick()
}
/**
* Resets the max resistance from the last resistance value received.
* Triggered from mounting reset
*/
fun resetMax() {
// Account for the resistance being able to be reversed
if (resistanceReversed != lastResistance < lastMinResetResistance) {
// Switching
resistanceReversed = lastResistance < lastMinResetResistance
minResistance = maxResistance
maxResistance = lastMinResetResistance
} else {
// Not switching
maxResistance = lastResistance
}
setFlexResistance(lastResistance)
tracker.dataTick()
}
/**
* Sets the flex resistance which is then calculated into an angle
*/
fun setFlexResistance(resistance: Float) {
// Dynamically calibrate the minimum resistance
minResistance = if (minResistance == Float.MIN_VALUE) {
resistance
} else if (!resistanceReversed) {
min(minResistance, resistance)
} else {
max(minResistance, resistance)
}
// Dynamically calibrate the maximum resistance
maxResistance = if (maxResistance == Float.MAX_VALUE) {
resistance
} else if (!resistanceReversed) {
max(maxResistance, resistance)
} else {
min(maxResistance, resistance)
}
// Get max angle
val maxBend = getMaxAngleForTrackerPosition(tracker.trackerPosition)
// Get angle and set it
val angle = if (minResistance == maxResistance) {
// Avoid division by 0
0f
} else {
maxBend * (resistance - minResistance) / (maxResistance - minResistance)
}
setFlexAngle(angle)
lastResistance = resistance
}
/**
* Sets an angle (rad) about the X axis
*/
fun setFlexAngle(angle: Float) {
// Sets the rotation of the tracker by the angle about a given axis depending on
// the tracker's TrackerPosition
when (tracker.trackerPosition) {
TrackerPosition.LEFT_INDEX_PROXIMAL, TrackerPosition.LEFT_INDEX_INTERMEDIATE,
TrackerPosition.LEFT_INDEX_DISTAL, TrackerPosition.LEFT_MIDDLE_PROXIMAL,
TrackerPosition.LEFT_MIDDLE_INTERMEDIATE, TrackerPosition.LEFT_MIDDLE_DISTAL,
TrackerPosition.LEFT_RING_PROXIMAL, TrackerPosition.LEFT_RING_INTERMEDIATE,
TrackerPosition.LEFT_RING_DISTAL, TrackerPosition.LEFT_LITTLE_PROXIMAL,
TrackerPosition.LEFT_LITTLE_INTERMEDIATE, TrackerPosition.LEFT_LITTLE_DISTAL,
TrackerPosition.RIGHT_SHOULDER,
-> tracker.setRotation(EulerAngles(EulerOrder.YZX, 0f, 0f, angle).toQuaternion())
TrackerPosition.RIGHT_INDEX_PROXIMAL, TrackerPosition.RIGHT_INDEX_INTERMEDIATE,
TrackerPosition.RIGHT_INDEX_DISTAL, TrackerPosition.RIGHT_MIDDLE_PROXIMAL,
TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE, TrackerPosition.RIGHT_MIDDLE_DISTAL,
TrackerPosition.RIGHT_RING_PROXIMAL, TrackerPosition.RIGHT_RING_INTERMEDIATE,
TrackerPosition.RIGHT_RING_DISTAL, TrackerPosition.RIGHT_LITTLE_PROXIMAL,
TrackerPosition.RIGHT_LITTLE_INTERMEDIATE, TrackerPosition.RIGHT_LITTLE_DISTAL,
TrackerPosition.LEFT_SHOULDER,
-> tracker.setRotation(EulerAngles(EulerOrder.YZX, 0f, 0f, -angle).toQuaternion())
TrackerPosition.LEFT_THUMB_PROXIMAL, TrackerPosition.LEFT_THUMB_INTERMEDIATE, TrackerPosition.LEFT_THUMB_DISTAL,
-> tracker.setRotation(EulerAngles(EulerOrder.YZX, thumbInitialOffset - angle, -angle * 0.05f, angle * 0.1f).toQuaternion())
TrackerPosition.RIGHT_THUMB_PROXIMAL, TrackerPosition.RIGHT_THUMB_INTERMEDIATE, TrackerPosition.RIGHT_THUMB_DISTAL,
-> tracker.setRotation(EulerAngles(EulerOrder.YZX, thumbInitialOffset - angle, angle * 0.05f, -angle * 0.1f).toQuaternion())
// Default to X axis (pitch)
else -> tracker.setRotation(EulerAngles(EulerOrder.YZX, angle, 0f, 0f).toQuaternion())
}
}
/**
* Gets the max angle for a TrackerPosition
*/
private fun getMaxAngleForTrackerPosition(trackerPosition: TrackerPosition?): Float {
if (trackerPosition == null) return FastMath.PI // 180 degrees
return when (trackerPosition) {
// 270 degrees
TrackerPosition.LEFT_INDEX_DISTAL, TrackerPosition.LEFT_MIDDLE_DISTAL,
TrackerPosition.LEFT_RING_DISTAL, TrackerPosition.LEFT_LITTLE_DISTAL,
TrackerPosition.RIGHT_INDEX_DISTAL, TrackerPosition.RIGHT_MIDDLE_DISTAL,
TrackerPosition.RIGHT_RING_DISTAL, TrackerPosition.RIGHT_LITTLE_DISTAL,
-> FastMath.PI + FastMath.HALF_PI
// 202.5 degrees
TrackerPosition.LEFT_THUMB_DISTAL, TrackerPosition.RIGHT_THUMB_DISTAL,
-> FastMath.PI + thumbInitialOffset
// 180 degrees
TrackerPosition.LEFT_INDEX_INTERMEDIATE, TrackerPosition.LEFT_MIDDLE_INTERMEDIATE,
TrackerPosition.LEFT_RING_INTERMEDIATE, TrackerPosition.LEFT_LITTLE_INTERMEDIATE,
TrackerPosition.RIGHT_INDEX_INTERMEDIATE, TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE,
TrackerPosition.RIGHT_RING_INTERMEDIATE, TrackerPosition.RIGHT_LITTLE_INTERMEDIATE,
-> FastMath.PI
// 112.5 degrees
TrackerPosition.LEFT_THUMB_INTERMEDIATE, TrackerPosition.RIGHT_THUMB_INTERMEDIATE,
-> FastMath.HALF_PI + thumbInitialOffset
// 90 degrees
TrackerPosition.LEFT_INDEX_PROXIMAL, TrackerPosition.LEFT_MIDDLE_PROXIMAL,
TrackerPosition.LEFT_RING_PROXIMAL, TrackerPosition.LEFT_LITTLE_PROXIMAL,
TrackerPosition.RIGHT_INDEX_PROXIMAL, TrackerPosition.RIGHT_MIDDLE_PROXIMAL,
TrackerPosition.RIGHT_RING_PROXIMAL, TrackerPosition.RIGHT_LITTLE_PROXIMAL,
-> FastMath.HALF_PI
// 67.5 degrees
TrackerPosition.LEFT_THUMB_PROXIMAL, TrackerPosition.RIGHT_THUMB_PROXIMAL,
-> FastMath.QUARTER_PI + thumbInitialOffset
// 45 degrees
TrackerPosition.LEFT_SHOULDER, TrackerPosition.RIGHT_SHOULDER,
-> FastMath.QUARTER_PI
// 135 degrees
else -> FastMath.HALF_PI + FastMath.QUARTER_PI
}
}
}
@@ -13,60 +13,59 @@ enum class TrackerPosition(
val designation: String,
val trackerRole: TrackerRole?,
val bodyPart: Int,
val id: Int,
) {
// If updating BodyPart of a TrackerRole,
// please also update SteamVRBridge#updateShareSettingsAutomatically()
HEAD("body:head", TrackerRole.HMD, BodyPart.HEAD, 1),
NECK("body:neck", TrackerRole.NECK, BodyPart.NECK, 2),
UPPER_CHEST("body:upper_chest", TrackerRole.CHEST, BodyPart.UPPER_CHEST, 3),
CHEST("body:chest", null, BodyPart.CHEST, 4),
WAIST("body:waist", null, BodyPart.WAIST, 5),
HIP("body:hip", TrackerRole.WAIST, BodyPart.HIP, 6),
LEFT_UPPER_LEG("body:left_upper_leg", TrackerRole.LEFT_KNEE, BodyPart.LEFT_UPPER_LEG, 7),
RIGHT_UPPER_LEG("body:right_upper_leg", TrackerRole.RIGHT_KNEE, BodyPart.RIGHT_UPPER_LEG, 8),
LEFT_LOWER_LEG("body:left_lower_leg", null, BodyPart.LEFT_LOWER_LEG, 9),
RIGHT_LOWER_LEG("body:right_lower_leg", null, BodyPart.RIGHT_LOWER_LEG, 10),
LEFT_FOOT("body:left_foot", TrackerRole.LEFT_FOOT, BodyPart.LEFT_FOOT, 11),
RIGHT_FOOT("body:right_foot", TrackerRole.RIGHT_FOOT, BodyPart.RIGHT_FOOT, 12),
LEFT_LOWER_ARM("body:left_lower_arm", null, BodyPart.LEFT_LOWER_ARM, 13),
RIGHT_LOWER_ARM("body:right_lower_arm", null, BodyPart.RIGHT_LOWER_ARM, 14),
LEFT_UPPER_ARM("body:left_upper_arm", TrackerRole.LEFT_ELBOW, BodyPart.LEFT_UPPER_ARM, 15),
RIGHT_UPPER_ARM("body:right_upper_arm", TrackerRole.RIGHT_ELBOW, BodyPart.RIGHT_UPPER_ARM, 16),
LEFT_HAND("body:left_hand", TrackerRole.LEFT_HAND, BodyPart.LEFT_HAND, 17),
RIGHT_HAND("body:right_hand", TrackerRole.RIGHT_HAND, BodyPart.RIGHT_HAND, 18),
LEFT_SHOULDER("body:left_shoulder", TrackerRole.LEFT_SHOULDER, BodyPart.LEFT_SHOULDER, 19),
RIGHT_SHOULDER("body:right_shoulder", TrackerRole.RIGHT_SHOULDER, BodyPart.RIGHT_SHOULDER, 20),
LEFT_THUMB_PROXIMAL("body:left_thumb_proximal", null, BodyPart.LEFT_THUMB_PROXIMAL, 21),
LEFT_THUMB_INTERMEDIATE("body:left_thumb_intermediate", null, BodyPart.LEFT_THUMB_INTERMEDIATE, 22),
LEFT_THUMB_DISTAL("body:left_thumb_distal", null, BodyPart.LEFT_THUMB_DISTAL, 23),
LEFT_INDEX_PROXIMAL("body:left_index_proximal", null, BodyPart.LEFT_INDEX_PROXIMAL, 24),
LEFT_INDEX_INTERMEDIATE("body:left_index_intermediate", null, BodyPart.LEFT_INDEX_INTERMEDIATE, 25),
LEFT_INDEX_DISTAL("body:left_index_distal", null, BodyPart.LEFT_INDEX_DISTAL, 26),
LEFT_MIDDLE_PROXIMAL("body:left_middle_proximal", null, BodyPart.LEFT_MIDDLE_PROXIMAL, 27),
LEFT_MIDDLE_INTERMEDIATE("body:left_middle_intermediate", null, BodyPart.LEFT_MIDDLE_INTERMEDIATE, 28),
LEFT_MIDDLE_DISTAL("body:left_middle_distal", null, BodyPart.LEFT_MIDDLE_DISTAL, 29),
LEFT_RING_PROXIMAL("body:left_ring_proximal", null, BodyPart.LEFT_RING_PROXIMAL, 30),
LEFT_RING_INTERMEDIATE("body:left_ring_intermediate", null, BodyPart.LEFT_RING_INTERMEDIATE, 31),
LEFT_RING_DISTAL("body:left_ring_distal", null, BodyPart.LEFT_RING_DISTAL, 32),
LEFT_LITTLE_PROXIMAL("body:left_little_proximal", null, BodyPart.LEFT_LITTLE_PROXIMAL, 33),
LEFT_LITTLE_INTERMEDIATE("body:left_little_intermediate", null, BodyPart.LEFT_LITTLE_INTERMEDIATE, 34),
LEFT_LITTLE_DISTAL("body:left_little_distal", null, BodyPart.LEFT_LITTLE_DISTAL, 35),
RIGHT_THUMB_PROXIMAL("body:right_thumb_proximal", null, BodyPart.RIGHT_THUMB_PROXIMAL, 36),
RIGHT_THUMB_INTERMEDIATE("body:right_thumb_intermediate", null, BodyPart.RIGHT_THUMB_INTERMEDIATE, 37),
RIGHT_THUMB_DISTAL("body:right_thumb_distal", null, BodyPart.RIGHT_THUMB_DISTAL, 38),
RIGHT_INDEX_PROXIMAL("body:right_index_proximal", null, BodyPart.RIGHT_INDEX_PROXIMAL, 39),
RIGHT_INDEX_INTERMEDIATE("body:right_index_intermediate", null, BodyPart.RIGHT_INDEX_INTERMEDIATE, 40),
RIGHT_INDEX_DISTAL("body:right_index_distal", null, BodyPart.RIGHT_INDEX_DISTAL, 41),
RIGHT_MIDDLE_PROXIMAL("body:right_middle_proximal", null, BodyPart.RIGHT_MIDDLE_PROXIMAL, 42),
RIGHT_MIDDLE_INTERMEDIATE("body:right_middle_intermediate", null, BodyPart.RIGHT_MIDDLE_INTERMEDIATE, 43),
RIGHT_MIDDLE_DISTAL("body:right_middle_distal", null, BodyPart.RIGHT_MIDDLE_DISTAL, 44),
RIGHT_RING_PROXIMAL("body:right_ring_proximal", null, BodyPart.RIGHT_RING_PROXIMAL, 45),
RIGHT_RING_INTERMEDIATE("body:right_ring_intermediate", null, BodyPart.RIGHT_RING_INTERMEDIATE, 46),
RIGHT_RING_DISTAL("body:right_ring_distal", null, BodyPart.RIGHT_RING_DISTAL, 47),
RIGHT_LITTLE_PROXIMAL("body:right_little_proximal", null, BodyPart.RIGHT_LITTLE_PROXIMAL, 48),
RIGHT_LITTLE_INTERMEDIATE("body:right_little_intermediate", null, BodyPart.RIGHT_LITTLE_INTERMEDIATE, 49),
RIGHT_LITTLE_DISTAL("body:right_little_distal", null, BodyPart.RIGHT_LITTLE_DISTAL, 50),
HEAD("body:head", TrackerRole.HMD, BodyPart.HEAD),
NECK("body:neck", TrackerRole.NECK, BodyPart.NECK),
UPPER_CHEST("body:upper_chest", TrackerRole.CHEST, BodyPart.UPPER_CHEST),
CHEST("body:chest", null, BodyPart.CHEST),
WAIST("body:waist", null, BodyPart.WAIST),
HIP("body:hip", TrackerRole.WAIST, BodyPart.HIP),
LEFT_UPPER_LEG("body:left_upper_leg", TrackerRole.LEFT_KNEE, BodyPart.LEFT_UPPER_LEG),
RIGHT_UPPER_LEG("body:right_upper_leg", TrackerRole.RIGHT_KNEE, BodyPart.RIGHT_UPPER_LEG),
LEFT_LOWER_LEG("body:left_lower_leg", null, BodyPart.LEFT_LOWER_LEG),
RIGHT_LOWER_LEG("body:right_lower_leg", null, BodyPart.RIGHT_LOWER_LEG),
LEFT_FOOT("body:left_foot", TrackerRole.LEFT_FOOT, BodyPart.LEFT_FOOT),
RIGHT_FOOT("body:right_foot", TrackerRole.RIGHT_FOOT, BodyPart.RIGHT_FOOT),
LEFT_LOWER_ARM("body:left_lower_arm", null, BodyPart.LEFT_LOWER_ARM),
RIGHT_LOWER_ARM("body:right_lower_arm", null, BodyPart.RIGHT_LOWER_ARM),
LEFT_UPPER_ARM("body:left_upper_arm", TrackerRole.LEFT_ELBOW, BodyPart.LEFT_UPPER_ARM),
RIGHT_UPPER_ARM("body:right_upper_arm", TrackerRole.RIGHT_ELBOW, BodyPart.RIGHT_UPPER_ARM),
LEFT_HAND("body:left_hand", TrackerRole.LEFT_HAND, BodyPart.LEFT_HAND),
RIGHT_HAND("body:right_hand", TrackerRole.RIGHT_HAND, BodyPart.RIGHT_HAND),
LEFT_SHOULDER("body:left_shoulder", TrackerRole.LEFT_SHOULDER, BodyPart.LEFT_SHOULDER),
RIGHT_SHOULDER("body:right_shoulder", TrackerRole.RIGHT_SHOULDER, BodyPart.RIGHT_SHOULDER),
LEFT_THUMB_PROXIMAL("body:left_thumb_proximal", null, BodyPart.LEFT_THUMB_PROXIMAL),
LEFT_THUMB_INTERMEDIATE("body:left_thumb_intermediate", null, BodyPart.LEFT_THUMB_INTERMEDIATE),
LEFT_THUMB_DISTAL("body:left_thumb_distal", null, BodyPart.LEFT_THUMB_DISTAL),
LEFT_INDEX_PROXIMAL("body:left_index_proximal", null, BodyPart.LEFT_INDEX_PROXIMAL),
LEFT_INDEX_INTERMEDIATE("body:left_index_intermediate", null, BodyPart.LEFT_INDEX_INTERMEDIATE),
LEFT_INDEX_DISTAL("body:left_index_distal", null, BodyPart.LEFT_INDEX_DISTAL),
LEFT_MIDDLE_PROXIMAL("body:left_middle_proximal", null, BodyPart.LEFT_MIDDLE_PROXIMAL),
LEFT_MIDDLE_INTERMEDIATE("body:left_middle_intermediate", null, BodyPart.LEFT_MIDDLE_INTERMEDIATE),
LEFT_MIDDLE_DISTAL("body:left_middle_distal", null, BodyPart.LEFT_MIDDLE_DISTAL),
LEFT_RING_PROXIMAL("body:left_ring_proximal", null, BodyPart.LEFT_RING_PROXIMAL),
LEFT_RING_INTERMEDIATE("body:left_ring_intermediate", null, BodyPart.LEFT_RING_INTERMEDIATE),
LEFT_RING_DISTAL("body:left_ring_distal", null, BodyPart.LEFT_RING_DISTAL),
LEFT_LITTLE_PROXIMAL("body:left_little_proximal", null, BodyPart.LEFT_LITTLE_PROXIMAL),
LEFT_LITTLE_INTERMEDIATE("body:left_little_intermediate", null, BodyPart.LEFT_LITTLE_INTERMEDIATE),
LEFT_LITTLE_DISTAL("body:left_little_distal", null, BodyPart.LEFT_LITTLE_DISTAL),
RIGHT_THUMB_PROXIMAL("body:right_thumb_proximal", null, BodyPart.RIGHT_THUMB_PROXIMAL),
RIGHT_THUMB_INTERMEDIATE("body:right_thumb_intermediate", null, BodyPart.RIGHT_THUMB_INTERMEDIATE),
RIGHT_THUMB_DISTAL("body:right_thumb_distal", null, BodyPart.RIGHT_THUMB_DISTAL),
RIGHT_INDEX_PROXIMAL("body:right_index_proximal", null, BodyPart.RIGHT_INDEX_PROXIMAL),
RIGHT_INDEX_INTERMEDIATE("body:right_index_intermediate", null, BodyPart.RIGHT_INDEX_INTERMEDIATE),
RIGHT_INDEX_DISTAL("body:right_index_distal", null, BodyPart.RIGHT_INDEX_DISTAL),
RIGHT_MIDDLE_PROXIMAL("body:right_middle_proximal", null, BodyPart.RIGHT_MIDDLE_PROXIMAL),
RIGHT_MIDDLE_INTERMEDIATE("body:right_middle_intermediate", null, BodyPart.RIGHT_MIDDLE_INTERMEDIATE),
RIGHT_MIDDLE_DISTAL("body:right_middle_distal", null, BodyPart.RIGHT_MIDDLE_DISTAL),
RIGHT_RING_PROXIMAL("body:right_ring_proximal", null, BodyPart.RIGHT_RING_PROXIMAL),
RIGHT_RING_INTERMEDIATE("body:right_ring_intermediate", null, BodyPart.RIGHT_RING_INTERMEDIATE),
RIGHT_RING_DISTAL("body:right_ring_distal", null, BodyPart.RIGHT_RING_DISTAL),
RIGHT_LITTLE_PROXIMAL("body:right_little_proximal", null, BodyPart.RIGHT_LITTLE_PROXIMAL),
RIGHT_LITTLE_INTERMEDIATE("body:right_little_intermediate", null, BodyPart.RIGHT_LITTLE_INTERMEDIATE),
RIGHT_LITTLE_DISTAL("body:right_little_distal", null, BodyPart.RIGHT_LITTLE_DISTAL),
;
/**
@@ -105,7 +104,6 @@ enum class TrackerPosition(
this[position.bodyPart] = position
}
}
private val byId = entries.associateBy { it.id }
private val byDesignation = entries.associateBy { it.designation.lowercase() }
private val byTrackerRole = entries.filter { it.trackerRole != null }.associateBy { it.trackerRole!! }
@@ -132,8 +130,5 @@ enum class TrackerPosition(
@JvmStatic
fun getByBodyPart(bodyPart: Int): TrackerPosition? = byBodyPart[bodyPart]
@JvmStatic
fun getById(id: Int): TrackerPosition? = byId[id]
}
}
@@ -7,7 +7,6 @@ import dev.slimevr.config.ArmsResetModes
import dev.slimevr.config.DriftCompensationConfig
import dev.slimevr.config.ResetsConfig
import dev.slimevr.filtering.CircularArrayList
import dev.slimevr.tracking.trackers.udp.TrackerDataType
import io.eiren.math.FloatMath.animateEase
import io.github.axisangles.ktmath.EulerAngles
import io.github.axisangles.ktmath.EulerOrder
@@ -214,15 +213,6 @@ class TrackerResetsHandler(val tracker: Tracker) {
* 0). This allows the tracker to be strapped to body at any pitch and roll.
*/
fun resetFull(reference: Quaternion) {
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE) {
tracker.trackerFlexHandler.resetMin()
postProcessResetFull()
return
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE) {
postProcessResetFull()
return
}
// Adjust for T-Pose (down)
tposeDownFix = if (((isLeftArmTracker() || isLeftFingerTracker()) && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
EulerAngles(EulerOrder.YZX, 0f, 0f, -FastMath.HALF_PI).toQuaternion()
@@ -286,10 +276,6 @@ class TrackerResetsHandler(val tracker: Tracker) {
calculateDrift(oldRot)
postProcessResetFull()
}
private fun postProcessResetFull() {
if (this.tracker.lastResetStatus != 0u) {
VRServer.instance.statusSystem.removeStatus(this.tracker.lastResetStatus)
this.tracker.lastResetStatus = 0u
@@ -305,12 +291,6 @@ class TrackerResetsHandler(val tracker: Tracker) {
* position should be corrected in the source.
*/
fun resetYaw(reference: Quaternion) {
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE ||
tracker.trackerDataType == TrackerDataType.FLEX_ANGLE
) {
return
}
// Old rot for drift compensation
val oldRot = adjustToReference(tracker.getRawRotation())
lastResetQuaternion = oldRot
@@ -345,15 +325,7 @@ class TrackerResetsHandler(val tracker: Tracker) {
* and stores it in mountRotFix, and adjusts yawFix
*/
fun resetMounting(reference: Quaternion) {
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE) {
tracker.trackerFlexHandler.resetMax()
tracker.resetFilteringQuats()
return
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE) {
return
} else if (!resetMountingFeet && isFootTracker()) {
return
}
if (!resetMountingFeet && isFootTracker()) return
// Get the current calibrated rotation
var rotBuf = adjustToDrift(tracker.getRawRotation() * mountingOrientation)
@@ -107,22 +107,6 @@ enum class MCUType(val id: UInt) {
}
}
enum class TrackerDataType(val id: UInt) {
ROTATION(0u),
FLEX_RESISTANCE(1u),
FLEX_ANGLE(2u),
;
fun getSolarType(): Int = this.id.toInt()
companion object {
private val byId = entries.associateBy { it.id }
@JvmStatic
fun getById(id: UInt): TrackerDataType? = byId[id]
}
}
@JvmInline
value class ConfigTypeId(val v: UShort)
@@ -5,7 +5,8 @@ import dev.slimevr.NetworkProtocol
import dev.slimevr.VRServer
import dev.slimevr.config.config
import dev.slimevr.protocol.rpc.MAG_TIMEOUT
import dev.slimevr.tracking.trackers.*
import dev.slimevr.tracking.trackers.Tracker
import dev.slimevr.tracking.trackers.TrackerStatus
import io.eiren.util.Util
import io.eiren.util.collections.FastList
import io.eiren.util.logging.LogManager
@@ -86,7 +87,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
ipAddress = addr
name = handshake.macString?.let { "udp://$it" }
descriptiveName = "udp:/$addr"
protocolVersion = handshake.protocolVersion
firmwareBuild = handshake.firmwareBuild
firmwareVersion = handshake.firmware
connectionsByAddress[address] = this
@@ -96,8 +97,8 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
"""
[TrackerServer] Tracker $i handed over to address $socketAddr.
Board type: ${handshake.boardType},
firmware name: ${handshake.firmware},
protocol version: $protocolVersion,
imu type: ${handshake.imuType},
firmware: ${handshake.firmware} ($firmwareBuild),
mac: ${handshake.macString},
name: $name
""".trimIndent(),
@@ -110,7 +111,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
name = handshake.macString?.let { "udp://$it" }
?: "udp:/$addr"
descriptiveName = "udp:/$addr"
protocolVersion = handshake.protocolVersion
firmwareBuild = handshake.firmwareBuild
firmwareVersion = handshake.firmware
val i = connections.indexOf(this)
LogManager
@@ -118,8 +119,8 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
"""
[TrackerServer] Tracker $i reconnected from address $socketAddr.
Board type: ${handshake.boardType},
firmware name: ${handshake.firmware},
protocol version: $protocolVersion,
imu type: ${handshake.imuType},
firmware: ${handshake.firmware} ($firmwareBuild),
mac: ${handshake.macString},
name: $name
""".trimIndent(),
@@ -136,7 +137,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
handshake.mcuType,
)
VRServer.instance.deviceManager.addDevice(connection)
connection.protocolVersion = handshake.protocolVersion
connection.firmwareBuild = handshake.firmwareBuild
connection.protocol = if (handshake.firmware?.isEmpty() == true) {
// Only old owoTrack doesn't report firmware and have different packet IDs with SlimeVR
NetworkProtocol.OWO_LEGACY
@@ -164,18 +165,18 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
"""
[TrackerServer] Tracker $i connected from address $socketAddr.
Board type: ${handshake.boardType},
firmware name: ${handshake.firmware},
protocol version: ${connection.protocolVersion},
imu type: ${handshake.imuType},
firmware: ${handshake.firmware} (${connection.firmwareBuild}),
mac: ${handshake.macString},
name: ${connection.name}
""".trimIndent(),
)
}
if (connection.protocol == NetworkProtocol.OWO_LEGACY || connection.protocolVersion < 9) {
if (connection.protocol == NetworkProtocol.OWO_LEGACY || connection.firmwareBuild < 9) {
// Set up new sensor for older firmware.
// Firmware after 7 should send sensor status packet and sensor
// will be created when it's received
setUpSensor(connection, 0, handshake.imuType, 1, MagnetometerStatus.NOT_SUPPORTED, null, TrackerDataType.ROTATION)
setUpSensor(connection, 0, handshake.imuType, 1, MagnetometerStatus.NOT_SUPPORTED)
}
connection
}
@@ -187,7 +188,7 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
}
private val mainScope = CoroutineScope(SupervisorJob())
private fun setUpSensor(connection: UDPDevice, trackerId: Int, sensorType: IMUType, sensorStatus: Int, magStatus: MagnetometerStatus, trackerPosition: TrackerPosition?, trackerDataType: TrackerDataType) {
private fun setUpSensor(connection: UDPDevice, trackerId: Int, sensorType: IMUType, sensorStatus: Int, magStatus: MagnetometerStatus) {
LogManager.info("[TrackerServer] Sensor $trackerId for ${connection.name} status: $sensorStatus")
var imuTracker = connection.getTracker(trackerId)
if (imuTracker == null) {
@@ -201,22 +202,21 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
VRServer.getNextLocalTrackerId(),
connection.name + "/" + trackerId,
"IMU Tracker $formattedHWID",
trackerPosition,
null,
trackerNum = trackerId,
hasRotation = true,
hasAcceleration = true,
userEditable = true,
imuType = if (trackerDataType == TrackerDataType.ROTATION) sensorType else null,
imuType = sensorType,
allowFiltering = true,
needsReset = true,
needsMounting = true,
usesTimeout = true,
magStatus = magStatus,
trackerDataType = trackerDataType,
)
connection.trackers[trackerId] = imuTracker
trackersConsumer.accept(imuTracker)
LogManager.info("[TrackerServer] Added sensor $trackerId for ${connection.name}, ImuType $sensorType, DataType $trackerDataType, default TrackerPosition $trackerPosition")
LogManager.info("[TrackerServer] Added sensor $trackerId for ${connection.name}, type $sensorType")
}
val status = UDPPacket15SensorInfo.getStatus(sensorStatus)
if (status != null) imuTracker.status = status
@@ -479,8 +479,6 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
packet.sensorType,
packet.sensorStatus,
magStatus,
packet.trackerPosition,
packet.trackerDataType,
)
// Send ack
bb.limit(bb.capacity())
@@ -563,17 +561,6 @@ class TrackersUDPServer(private val port: Int, name: String, private val tracker
LogManager.info("[TrackerServer] Acknowledged config change on ${connection.descriptiveName} (${trackers.map { it.trackerNum }.joinToString()}). Config changed on ${packet.configType}")
}
is UDPPacket26FlexData -> {
tracker = connection?.getTracker(packet.sensorId)
if (tracker == null) return
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE) {
tracker.trackerFlexHandler.setFlexResistance(packet.flexData)
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE) {
tracker.trackerFlexHandler.setFlexAngle(packet.flexData)
}
tracker.dataTick()
}
is UDPPacket200ProtocolChange -> {}
}
}
@@ -48,7 +48,7 @@ class UDPDevice(
var protocol: NetworkProtocol? = null
@JvmField
var protocolVersion = 0
var firmwareBuild = 0
@JvmField
var timedOut = false
@@ -1,6 +1,5 @@
package dev.slimevr.tracking.trackers.udp
import dev.slimevr.tracking.trackers.TrackerPosition
import dev.slimevr.tracking.trackers.TrackerStatus
import io.github.axisangles.ktmath.Quaternion
import io.github.axisangles.ktmath.Vector3
@@ -96,7 +95,7 @@ data class UDPPacket3Handshake(
var boardType: BoardType = BoardType.UNKNOWN,
var imuType: IMUType = IMUType.UNKNOWN,
var mcuType: MCUType = MCUType.UNKNOWN,
var protocolVersion: Int = 0,
var firmwareBuild: Int = 0,
var firmware: String? = null,
var macString: String? = null,
) : UDPPacket(3) {
@@ -116,7 +115,7 @@ data class UDPPacket3Handshake(
buf.int
buf.int // IMU info
}
if (buf.remaining() > 3) protocolVersion = buf.int
if (buf.remaining() > 3) firmwareBuild = buf.int
var length = 0
if (buf.remaining() > 0) length = buf.get().toInt()
// firmware version length is 1 longer than
@@ -225,8 +224,6 @@ data class UDPPacket15SensorInfo(
var sensorStatus: Int = 0,
var sensorType: IMUType = IMUType.UNKNOWN,
var sensorConfig: SensorConfig? = null,
var trackerDataType: TrackerDataType = TrackerDataType.ROTATION,
var trackerPosition: TrackerPosition? = null,
) : UDPPacket(15),
SensorSpecificPacket {
override var sensorId = 0
@@ -234,13 +231,12 @@ data class UDPPacket15SensorInfo(
sensorId = buf.get().toInt() and 0xFF
sensorStatus = buf.get().toInt() and 0xFF
if (buf.remaining() > 0) {
sensorType = IMUType.getById(buf.get().toUInt() and 0xFFu) ?: IMUType.UNKNOWN
sensorType =
IMUType.getById(buf.get().toUInt() and 0xFFu) ?: IMUType.UNKNOWN
}
if (buf.remaining() > 1) {
sensorConfig = SensorConfig(buf.getShort().toUShort())
}
if (buf.remaining() > 0) trackerPosition = TrackerPosition.getById(buf.get().toInt() and 0xFF)
if (buf.remaining() > 0) trackerDataType = TrackerDataType.getById(buf.get().toUInt() and 0xFFu) ?: TrackerDataType.ROTATION
}
companion object {
@@ -382,18 +378,6 @@ data class UDPPacket25SetConfigFlag(
}
}
data class UDPPacket26FlexData(
var flexData: Float = 0f,
) : UDPPacket(26),
SensorSpecificPacket {
override var sensorId = 0
override fun readData(buf: ByteBuffer) {
sensorId = buf.get().toInt() and 0xFF
flexData = UDPUtils.getSafeBufferFloat(buf)
}
}
data class UDPPacket200ProtocolChange(
var targetProtocol: Int = 0,
var targetProtocolVersion: Int = 0,
@@ -115,7 +115,6 @@ class UDPProtocolParser {
PACKET_USER_ACTION -> UDPPacket21UserAction()
PACKET_FEATURE_FLAGS -> UDPPacket22FeatureFlags()
PACKET_ACK_CONFIG_CHANGE -> UDPPacket24AckConfigChange()
PACKET_FLEX_DATA -> UDPPacket26FlexData()
PACKET_PROTOCOL_CHANGE -> UDPPacket200ProtocolChange()
else -> null
}
@@ -151,7 +150,6 @@ class UDPProtocolParser {
const val PACKET_ROTATION_AND_ACCELERATION = 23
const val PACKET_ACK_CONFIG_CHANGE = 24
const val PACKET_SET_CONFIG_FLAG = 25
const val PACKET_FLEX_DATA = 26
const val PACKET_BUNDLE = 100
const val PACKET_BUNDLE_COMPACT = 101
const val PACKET_PROTOCOL_CHANGE = 200