-
-
Notifications
You must be signed in to change notification settings - Fork 182
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement magnetometer toggle for firmware (#1114)
- Loading branch information
Showing
21 changed files
with
596 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
160 changes: 160 additions & 0 deletions
160
gui/src/components/settings/pages/MagnetometerToggleSetting.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| import { CheckBox } from '@/components/commons/Checkbox'; | ||
| import { Typography } from '@/components/commons/Typography'; | ||
| import { useWebsocketAPI } from '@/hooks/websocket-api'; | ||
| import { Localized, useLocalization } from '@fluent/react'; | ||
| import { useCallback, useEffect, useRef, useState } from 'react'; | ||
| import { useForm } from 'react-hook-form'; | ||
| import { | ||
| ChangeMagToggleRequestT, | ||
| DeviceIdT, | ||
| MagToggleRequestT, | ||
| MagToggleResponseT, | ||
| RpcMessage, | ||
| TrackerIdT, | ||
| } from 'solarxr-protocol'; | ||
| import { Link } from 'react-router-dom'; | ||
|
|
||
| interface MagnetometerToggleForm { | ||
| magToggle: boolean; | ||
| } | ||
|
|
||
| export function MagnetometerToggleSetting({ | ||
| trackerNum, | ||
| deviceId, | ||
| settingType, | ||
| id, | ||
| }: { | ||
| trackerNum?: number; | ||
| deviceId?: number; | ||
| settingType: 'general' | 'tracker'; | ||
| id?: string; | ||
| }) { | ||
| const { l10n } = useLocalization(); | ||
| const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); | ||
| const originalValue = useRef<boolean | null>(null); | ||
| // used to disable the tracker specific toggle if false | ||
| const [globalToggle, setGlobalToggle] = useState(false); | ||
| const [waitingMag, setWaitingMag] = useState(false); | ||
| const { control, watch, handleSubmit, reset } = | ||
| useForm<MagnetometerToggleForm>({ | ||
| defaultValues: { magToggle: settingType === 'tracker' }, | ||
| }); | ||
|
|
||
| const onSubmit = useCallback( | ||
| (values: MagnetometerToggleForm) => { | ||
| if (originalValue.current === values.magToggle) return; | ||
| setWaitingMag(true); | ||
| const req = new ChangeMagToggleRequestT(); | ||
| if (trackerNum !== undefined) { | ||
| const id = new TrackerIdT( | ||
| deviceId ? new DeviceIdT(deviceId) : undefined, | ||
| trackerNum | ||
| ); | ||
| req.trackerId = id; | ||
| } | ||
|
|
||
| req.enable = values.magToggle; | ||
| sendRPCPacket(RpcMessage.ChangeMagToggleRequest, req); | ||
| }, | ||
| [trackerNum, deviceId] | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| const subscription = watch(() => handleSubmit(onSubmit)()); | ||
| return () => subscription.unsubscribe(); | ||
| }, []); | ||
|
|
||
| useEffect(() => { | ||
| const req = new MagToggleRequestT(); | ||
| if (trackerNum !== undefined) { | ||
| const id = new TrackerIdT( | ||
| deviceId ? new DeviceIdT(deviceId) : undefined, | ||
| trackerNum | ||
| ); | ||
| req.trackerId = id; | ||
| sendRPCPacket(RpcMessage.MagToggleRequest, new MagToggleRequestT()); | ||
| } | ||
| sendRPCPacket(RpcMessage.MagToggleRequest, req); | ||
| }, [trackerNum, deviceId]); | ||
|
|
||
| useRPCPacket(RpcMessage.MagToggleResponse, (mag: MagToggleResponseT) => { | ||
| if (trackerNum !== undefined && mag.trackerId?.trackerNum === undefined) { | ||
| setGlobalToggle(mag.enable); | ||
| } | ||
| if ( | ||
| mag.trackerId?.trackerNum !== trackerNum || | ||
| mag.trackerId?.deviceId?.id !== deviceId | ||
| ) { | ||
| return; | ||
| } | ||
| originalValue.current = mag.enable; | ||
| setWaitingMag(false); | ||
| reset({ magToggle: mag.enable }); | ||
| }); | ||
|
|
||
| return settingType === 'general' ? ( | ||
| <> | ||
| <div className="flex flex-col pt-5 pb-3" id={id}> | ||
| <Typography bold> | ||
| {l10n.getString( | ||
| 'settings-general-tracker_mechanics-use_mag_on_all_trackers' | ||
| )} | ||
| </Typography> | ||
| <Localized | ||
| id="settings-general-tracker_mechanics-use_mag_on_all_trackers-description" | ||
| elems={{ b: <b></b> }} | ||
| > | ||
| <Typography | ||
| color="secondary" | ||
| whitespace="whitespace-pre-line" | ||
| ></Typography> | ||
| </Localized> | ||
| </div> | ||
| <CheckBox | ||
| variant="toggle" | ||
| outlined | ||
| control={control} | ||
| loading={waitingMag} | ||
| name="magToggle" | ||
| label={l10n.getString( | ||
| 'settings-general-tracker_mechanics-use_mag_on_all_trackers-label' | ||
| )} | ||
| /> | ||
| </> | ||
| ) : ( | ||
| <div className="flex flex-col gap-2 w-full mt-3" id={id}> | ||
| <Typography variant="section-title"> | ||
| {l10n.getString('tracker-settings-use_mag')} | ||
| </Typography> | ||
| <Localized | ||
| id="tracker-settings-use_mag-description" | ||
| elems={{ | ||
| b: <b></b>, | ||
| magSetting: ( | ||
| <Link | ||
| to="/settings/trackers" | ||
| state={{ scrollTo: 'mechanics-magnetometer' }} | ||
| className="underline" | ||
| ></Link> | ||
| ), | ||
| }} | ||
| > | ||
| <Typography | ||
| color="secondary" | ||
| whitespace="whitespace-pre-line" | ||
| ></Typography> | ||
| </Localized> | ||
| <div className="flex"> | ||
| <CheckBox | ||
| variant="toggle" | ||
| outlined | ||
| loading={waitingMag} | ||
| disabled={!globalToggle} | ||
| name="magToggle" | ||
| control={control} | ||
| label={l10n.getString('tracker-settings-use_mag-label')} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
server/core/src/main/java/dev/slimevr/config/ServerConfig.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.