From 26f330c762f0490a4b212276554527448dc447fa Mon Sep 17 00:00:00 2001 From: lucas lelievre Date: Tue, 3 Jun 2025 18:11:42 +0200 Subject: [PATCH] Remove Drift compensation (#1461) --- .../ClearDriftCompensationButton.tsx | 28 --------- gui/src/components/WidgetsComponent.tsx | 26 +------- .../pages/mounting/ManualMounting.tsx | 3 +- .../trackers-assign/TrackerAssignment.tsx | 3 +- .../components/tracker/TrackerSettings.tsx | 63 +++---------------- 5 files changed, 13 insertions(+), 110 deletions(-) delete mode 100644 gui/src/components/ClearDriftCompensationButton.tsx diff --git a/gui/src/components/ClearDriftCompensationButton.tsx b/gui/src/components/ClearDriftCompensationButton.tsx deleted file mode 100644 index e43d0e835..000000000 --- a/gui/src/components/ClearDriftCompensationButton.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import { Localized } from '@fluent/react'; -import { ClearDriftCompensationRequestT, RpcMessage } from 'solarxr-protocol'; -import { useWebsocketAPI } from '@/hooks/websocket-api'; -import { BigButton } from './commons/BigButton'; -import { TrashIcon } from './commons/icon/TrashIcon'; - -export function ClearDriftCompensationButton({ - disabled, -}: { - disabled: boolean; -}) { - const { sendRPCPacket } = useWebsocketAPI(); - - const clearDriftCompensation = () => { - const record = new ClearDriftCompensationRequestT(); - sendRPCPacket(RpcMessage.ClearDriftCompensationRequest, record); - }; - - return ( - - } - onClick={clearDriftCompensation} - disabled={disabled} - > - - ); -} diff --git a/gui/src/components/WidgetsComponent.tsx b/gui/src/components/WidgetsComponent.tsx index fc797dac8..4e4b0b9cc 100644 --- a/gui/src/components/WidgetsComponent.tsx +++ b/gui/src/components/WidgetsComponent.tsx @@ -1,22 +1,14 @@ import { Localized, useLocalization } from '@fluent/react'; import { BVHButton } from './BVHButton'; -import { ClearDriftCompensationButton } from './ClearDriftCompensationButton'; import { TrackingPauseButton } from './TrackingPauseButton'; import { ResetButton } from './home/ResetButton'; import { OverlayWidget } from './widgets/OverlayWidget'; import { TipBox } from './commons/TipBox'; import { DeveloperModeWidget } from './widgets/DeveloperModeWidget'; import { useConfig } from '@/hooks/config'; -import { - ResetType, - RpcMessage, - SettingsRequestT, - SettingsResponseT, - StatusData, -} from 'solarxr-protocol'; -import { useEffect, useMemo, useState } from 'react'; +import { ResetType, StatusData } from 'solarxr-protocol'; +import { useMemo } from 'react'; import { parseStatusToLocale, useStatusContext } from '@/hooks/status-system'; -import { useWebsocketAPI } from '@/hooks/websocket-api'; import { ClearMountingButton } from './ClearMountingButton'; import { ToggleableSkeletonVisualizerWidget } from './widgets/SkeletonVisualizerWidget'; import { useAtomValue } from 'jotai'; @@ -56,17 +48,6 @@ function UnprioritizedStatuses() { export function WidgetsComponent() { 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 ( <> @@ -77,9 +58,6 @@ export function WidgetsComponent() { -
diff --git a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx index 4ff41b5ad..1b6836b30 100644 --- a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx +++ b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx @@ -56,8 +56,7 @@ export function ManualMountingPage() { mountingOrientationDegrees ); assignreq.trackerId = td.tracker.trackerId; - assignreq.allowDriftCompensation = - td.tracker.info?.allowDriftCompensation ?? true; + assignreq.allowDriftCompensation = false; sendRPCPacket(RpcMessage.AssignTrackerRequest, assignreq); }); diff --git a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx b/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx index 7a1ebf222..35a400e04 100644 --- a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx +++ b/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx @@ -216,8 +216,7 @@ export function TrackersAssignPage() { assignreq.bodyPosition = role; assignreq.mountingOrientation = rotation; assignreq.trackerId = trackerId; - assignreq.allowDriftCompensation = - tracker?.tracker?.info?.allowDriftCompensation ?? true; + assignreq.allowDriftCompensation = false; sendRPCPacket(RpcMessage.AssignTrackerRequest, assignreq); }; diff --git a/gui/src/components/tracker/TrackerSettings.tsx b/gui/src/components/tracker/TrackerSettings.tsx index 793afa429..5bb617154 100644 --- a/gui/src/components/tracker/TrackerSettings.tsx +++ b/gui/src/components/tracker/TrackerSettings.tsx @@ -26,7 +26,6 @@ import { import { ArrowLink } from '@/components/commons/ArrowLink'; import { BodyPartIcon } from '@/components/commons/BodyPartIcon'; import { Button } from '@/components/commons/Button'; -import { CheckBox } from '@/components/commons/Checkbox'; import { WarningIcon } from '@/components/commons/icon/WarningIcon'; import { Input } from '@/components/commons/Input'; import { Typography } from '@/components/commons/Typography'; @@ -57,7 +56,6 @@ export function TrackerSettingsPage() { const { l10n } = useLocalization(); const { sendRPCPacket } = useWebsocketAPI(); - const [firstLoad, setFirstLoad] = useState(false); const [selectRotation, setSelectRotation] = useState(false); const [selectBodypart, setSelectBodypart] = useState(false); const { trackernum, deviceid } = useParams<{ @@ -66,16 +64,14 @@ export function TrackerSettingsPage() { }>(); const { control, watch, reset, handleSubmit } = useForm<{ trackerName: string | null; - allowDriftCompensation: boolean | null; }>({ defaultValues: { trackerName: null, - allowDriftCompensation: null, }, reValidateMode: 'onSubmit', }); const setIgnoredTracker = useSetAtom(ignoredTrackersAtom); - const { trackerName, allowDriftCompensation } = watch(); + const { trackerName } = watch(); const tracker = useTrackerFromId(trackernum, deviceid); @@ -89,8 +85,7 @@ export function TrackerSettingsPage() { ); assignreq.bodyPosition = tracker?.tracker.info?.bodyPart || BodyPart.NONE; assignreq.trackerId = tracker?.tracker.trackerId; - if (allowDriftCompensation != null) - assignreq.allowDriftCompensation = allowDriftCompensation; + assignreq.allowDriftCompensation = false; sendRPCPacket(RpcMessage.AssignTrackerRequest, assignreq); setSelectRotation(false); }; @@ -101,8 +96,7 @@ export function TrackerSettingsPage() { const assignreq = new AssignTrackerRequestT(); assignreq.bodyPosition = role; assignreq.trackerId = tracker?.tracker.trackerId; - if (allowDriftCompensation != null) - assignreq.allowDriftCompensation = allowDriftCompensation; + assignreq.allowDriftCompensation = false; sendRPCPacket(RpcMessage.AssignTrackerRequest, assignreq); setSelectBodypart(false); }; @@ -113,12 +107,7 @@ export function TrackerSettingsPage() { const updateTrackerSettings = () => { if (!tracker) return; - if (allowDriftCompensation == null) return; - if ( - trackerName == tracker.tracker.info?.customName && - allowDriftCompensation == tracker.tracker.info?.allowDriftCompensation - ) - return; + if (trackerName == tracker.tracker.info?.customName) return; const assignreq = new AssignTrackerRequestT(); assignreq.bodyPosition = tracker?.tracker.info?.bodyPart || BodyPart.NONE; assignreq.mountingOrientation = currRotation @@ -127,7 +116,7 @@ export function TrackerSettingsPage() { assignreq.displayName = trackerName ?? null; assignreq.trackerId = tracker?.tracker.trackerId; - assignreq.allowDriftCompensation = allowDriftCompensation; + assignreq.allowDriftCompensation = false; sendRPCPacket(RpcMessage.AssignTrackerRequest, assignreq); }; @@ -138,21 +127,10 @@ export function TrackerSettingsPage() { useDebouncedEffect(() => updateTrackerSettings(), [trackerName], 1000); useEffect(() => { - updateTrackerSettings(); - }, [allowDriftCompensation]); - - useEffect(() => { - if (tracker && !firstLoad) setFirstLoad(true); - }, [tracker, firstLoad]); - - useEffect(() => { - if (firstLoad) { - reset({ - trackerName: tracker?.tracker.info?.customName as string | null, - allowDriftCompensation: tracker?.tracker.info?.allowDriftCompensation, - }); - } - }, [firstLoad]); + reset({ + trackerName: tracker?.tracker.info?.customName as string | null, + }); + }, []); const boardType = useMemo(() => { if (tracker?.device?.hardwareInfo?.officialBoardType) { @@ -469,29 +447,6 @@ export function TrackerSettingsPage() {
)} - {tracker?.tracker.info?.isImu && ( -
- - {l10n.getString('tracker-settings-drift_compensation_section')} - - - {l10n.getString( - 'tracker-settings-drift_compensation_section-description' - )} - -
- -
-
- )} {tracker?.tracker.info?.isImu && tracker?.tracker.info?.magnetometer !== MagnetometerStatus.NOT_SUPPORTED && (