diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl
index 3b865671f..4601d6dd1 100644
--- a/gui/public/i18n/en/translation.ftl
+++ b/gui/public/i18n/en/translation.ftl
@@ -92,6 +92,9 @@ widget-overlay = Overlay
widget-overlay-is_visible_label = Show Overlay in SteamVR
widget-overlay-is_mirrored_label = Display Overlay as Mirror
+## Widget: Drift compensation
+widget-drift_compensation-clear = Clear drift compensation
+
## Widget: Developer settings
widget-developer_mode = Developer Mode
widget-developer_mode-high_contrast = High contrast
diff --git a/gui/src/components/ClearDriftCompensationButton.tsx b/gui/src/components/ClearDriftCompensationButton.tsx
new file mode 100644
index 000000000..4caf687c6
--- /dev/null
+++ b/gui/src/components/ClearDriftCompensationButton.tsx
@@ -0,0 +1,20 @@
+import { useLocalization } from '@fluent/react';
+import { ClearDriftCompensationRequestT, RpcMessage } from 'solarxr-protocol';
+import { useWebsocketAPI } from '../hooks/websocket-api';
+import { Button } from './commons/Button';
+
+export function ClearDriftCompensationButton() {
+ const { l10n } = useLocalization();
+ const { sendRPCPacket } = useWebsocketAPI();
+
+ const clearDriftCompensation = () => {
+ const record = new ClearDriftCompensationRequestT();
+ sendRPCPacket(RpcMessage.ClearDriftCompensationRequest, record);
+ };
+
+ return (
+
+ );
+}
diff --git a/gui/src/components/MainLayout.tsx b/gui/src/components/MainLayout.tsx
index c25a550f5..701ee0d32 100644
--- a/gui/src/components/MainLayout.tsx
+++ b/gui/src/components/MainLayout.tsx
@@ -1,6 +1,13 @@
import classNames from 'classnames';
-import { ReactNode } from 'react';
-import { ResetType } from 'solarxr-protocol';
+import { ReactNode, useEffect, useState } from 'react';
+import {
+ DriftCompensationSettings,
+ DriftCompensationSettingsT,
+ ResetType,
+ RpcMessage,
+ SettingsRequestT,
+ SettingsResponseT,
+} from 'solarxr-protocol';
import { useConfig } from '../hooks/config';
import { useLayout } from '../hooks/layout';
import { BVHButton } from './BVHButton';
@@ -9,6 +16,8 @@ import { Navbar } from './Navbar';
import { TopBar } from './TopBar';
import { DeveloperModeWidget } from './widgets/DeveloperModeWidget';
import { OverlayWidget } from './widgets/OverlayWidget';
+import { ClearDriftCompensationButton } from './ClearDriftCompensationButton';
+import { useWebsocketAPI } from '../hooks/websocket-api';
export function MainLayoutRoute({
children,
@@ -22,6 +31,18 @@ export function MainLayoutRoute({
const { layoutHeight, ref } = useLayout();
const { layoutWidth, ref: refw } = useLayout();
const { config } = useConfig();
+ const { useRPCPacket, sendRPCPacket } = useWebsocketAPI();
+ const [driftCompensationEnabled, setDriftCompensationEnabled] =
+ useState(false);
+
+ useEffect(() => {
+ sendRPCPacket(RpcMessage.SettingsRequest, new SettingsRequestT());
+ }, []);
+
+ useRPCPacket(RpcMessage.SettingsResponse, (settings: SettingsResponseT) => {
+ if (settings.driftCompensation != null)
+ setDriftCompensationEnabled(settings.driftCompensation.enabled);
+ });
return (
<>
@@ -59,6 +80,9 @@ export function MainLayoutRoute({
>
+ {driftCompensationEnabled && (
+
+ )}
diff --git a/server/src/main/java/dev/slimevr/config/DriftCompensationConfig.java b/server/src/main/java/dev/slimevr/config/DriftCompensationConfig.java
index ff350ccfd..ea916ca5a 100644
--- a/server/src/main/java/dev/slimevr/config/DriftCompensationConfig.java
+++ b/server/src/main/java/dev/slimevr/config/DriftCompensationConfig.java
@@ -33,6 +33,15 @@ public class DriftCompensationConfig {
}
}
+ public void clearTrackersDriftCompensation() {
+ for (Tracker t : Main.getVrServer().getAllTrackers()) {
+ Tracker tracker = t.get();
+ if (tracker instanceof IMUTracker imuTracker) {
+ imuTracker.clearDriftCompensation();
+ }
+ }
+ }
+
public boolean getEnabled() {
return enabled;
diff --git a/server/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.java b/server/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.java
index 9acfa966a..c96c583d8 100644
--- a/server/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.java
+++ b/server/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.java
@@ -43,6 +43,10 @@ public class RPCHandler extends ProtocolHandler
registerPacketListener(RpcMessage.ResetRequest, this::onResetRequest);
registerPacketListener(RpcMessage.AssignTrackerRequest, this::onAssignTrackerRequest);
+ registerPacketListener(
+ RpcMessage.ClearDriftCompensationRequest,
+ this::onClearDriftCompensationRequest
+ );
registerPacketListener(RpcMessage.RecordBVHRequest, this::onRecordBVHRequest);
@@ -218,6 +222,22 @@ public class RPCHandler extends ProtocolHandler
this.api.server.trackerUpdated(tracker);
}
+ public void onClearDriftCompensationRequest(
+ GenericConnection conn,
+ RpcMessageHeader messageHeader
+ ) {
+ ClearDriftCompensationRequest req = (ClearDriftCompensationRequest) messageHeader
+ .message(new ClearDriftCompensationRequest());
+ if (req == null)
+ return;
+
+ this.api.server
+ .getConfigManager()
+ .getVrConfig()
+ .getDriftCompensation()
+ .clearTrackersDriftCompensation();
+ }
+
@Override
public void onMessage(GenericConnection conn, RpcMessageHeader message) {
BiConsumer consumer = this.handlers[message
diff --git a/server/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java b/server/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java
index 9dc6ee9fa..1052f5343 100644
--- a/server/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java
+++ b/server/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java
@@ -213,6 +213,16 @@ public class IMUTracker
}
}
+ public void clearDriftCompensation() {
+ driftSince = 0L;
+ timeAtLastReset = 0L;
+ totalDriftTime = 0L;
+ if (driftQuats != null) {
+ driftQuats.clear();
+ driftTimes.clear();
+ }
+ }
+
@Override
public void tick() {
if (magnetometerCalibrated && hasNewCorrectionData) {
diff --git a/solarxr-protocol b/solarxr-protocol
index 6d4c79277..38bb61821 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit 6d4c7927708d523e5cd36e228c71024d8f5cdd79
+Subproject commit 38bb618219a62506604dd2e5183ed6a3431681c2