From 6c25eae4f09efec373fa4bc221b690159f5ca59d Mon Sep 17 00:00:00 2001 From: Erimel Date: Mon, 19 Oct 2026 17:44:43 -0400 Subject: [PATCH] Temp patch for accel / Step Mounting --- .../java/dev/slimevr/stepmounting/behaviours.kt | 2 +- .../src/main/java/dev/slimevr/udp/behaviours.kt | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/stepmounting/behaviours.kt b/server/core/src/main/java/dev/slimevr/stepmounting/behaviours.kt index 9725f32db..2c2a5f937 100644 --- a/server/core/src/main/java/dev/slimevr/stepmounting/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/stepmounting/behaviours.kt @@ -60,7 +60,7 @@ val COEFFICIENTS = ButterworthCoefficients( const val START_THRESHOLD = 0.4f // in m/s^2 const val END_THRESHOLD = 0.3f // in m/s^2 const val MIN_MOVEMENT_DURATION_MS = 3000L -const val ERROR_THRESHOLD = 0.3f +const val ERROR_THRESHOLD = 0.4f // TODO increased temporarily. Used to be 0.3m fun movementDetector(updates: Flow) = flow { val lowpass = Vector3Butterworth(COEFFICIENTS) diff --git a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt index ebca9ba48..90bbdb0ae 100644 --- a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt @@ -23,13 +23,15 @@ import kotlin.random.Random import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds -/** - * Change between IMU axes and OpenGL/SteamVR axes - */ +/** Convert from IMU axes to OpenGL/SteamVR axes */ internal val AXES_OFFSET = Quaternion.fromRotationVector(-FastMath.HALF_PI, 0f, 0f) + +// TODO: Only apply this to firmwares <=0.7.3 +private val ACCEL_SENSOR_OFFSET_CORRECTION = Quaternion.rotationAroundZAxis(-FastMath.PI) + internal const val CONNECTION_TIMEOUT_MS = 5000L -internal suspend fun assignTracker(receiver: UDPConnection, device: Device, info: SensorInfo): Pair { +internal fun assignTracker(receiver: UDPConnection, device: Device, info: SensorInfo): Pair { val deviceState = device.context.state.value val deviceHardwareId = deviceState.hardwareId ?: udpHardwareId(deviceState.macAddress, deviceState.address) val hardwareId = "$deviceHardwareId:${info.sensorId}" @@ -393,12 +395,12 @@ class SensorRotationBehaviour : UDPConnectionBehaviour { receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.SetRotation(rotation = AXES_OFFSET * event.data.rotation, acceleration = event.data.acceleration)) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = AXES_OFFSET * event.data.rotation, acceleration = ACCEL_SENSOR_OFFSET_CORRECTION.sandwich(event.data.acceleration))) }.launchIn(receiver.context.scope) receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.SetRotation(acceleration = event.data.acceleration)) + tracker.context.dispatch(TrackerActions.SetRotation(acceleration = ACCEL_SENSOR_OFFSET_CORRECTION.sandwich(event.data.acceleration))) }.launchIn(receiver.context.scope) receiver.packetEvents.onPacket { event ->