diff --git a/photon-client/src/components/dashboard/tabs/TargetsTab.vue b/photon-client/src/components/dashboard/tabs/TargetsTab.vue index 61de911b4e..4acce69212 100644 --- a/photon-client/src/components/dashboard/tabs/TargetsTab.vue +++ b/photon-client/src/components/dashboard/tabs/TargetsTab.vue @@ -1,6 +1,6 @@ @@ -76,8 +76,15 @@ import { useStateStore } from "@/stores/StateStore"; - - Multi-tag pose, field-to-robot + + Multi-tag pose, field-to-robot X meters diff --git a/photon-client/src/components/settings/ApriltagControlCard.vue b/photon-client/src/components/settings/ApriltagControlCard.vue index bc9a18ca2e..2a0a5e0c48 100644 --- a/photon-client/src/components/settings/ApriltagControlCard.vue +++ b/photon-client/src/components/settings/ApriltagControlCard.vue @@ -5,16 +5,14 @@ import { useStateStore } from "@/stores/StateStore"; import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore"; import { Euler, Quaternion } from "three"; -function quatToEuler(quat) { +const quatToEuler = (quat: { X: number; Y: number; Z: number; W: number }): Euler => { console.log(quat); - quat = new Quaternion(quat.X, quat.Y, quat.Z, quat.W); - return new Euler().setFromQuaternion(quat, "ZYX"); -} + const three_quat = new Quaternion(quat.X, quat.Y, quat.Z, quat.W); + return new Euler().setFromQuaternion(three_quat, "ZYX"); +}; // Convert from radians to degrees. -const degrees = function (radians) { - return (radians * 180) / Math.PI; -}; +const degrees = (radians: number): number => (radians * 180) / Math.PI; diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index b5bfd9f612..54714b7f42 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -272,6 +272,7 @@ export type ActivePipelineSettings = | ColoredShapePipelineSettings | AprilTagPipelineSettings | ArucoPipelineSettings; + export type ActiveConfigurablePipelineSettings = | ConfigurableReflectivePipelineSettings | ConfigurableColoredShapePipelineSettings