diff --git a/photon-client/src/components/dashboard/tabs/PnPTab.vue b/photon-client/src/components/dashboard/tabs/PnPTab.vue index c486d3ef9f..c8831e944b 100644 --- a/photon-client/src/components/dashboard/tabs/PnPTab.vue +++ b/photon-client/src/components/dashboard/tabs/PnPTab.vue @@ -26,8 +26,8 @@ const interactiveCols = computed( { name: '2020 High Goal Outer', value: TargetModel.InfiniteRechargeHighGoalOuter }, { name: '2020 Power Cell (7in)', value: TargetModel.CircularPowerCell7in }, { name: '2022 Cargo Ball (9.5in)', value: TargetModel.RapidReactCircularCargoBall }, - { name: '2023 AprilTag 6in (16h5)', value: TargetModel.kAprilTag6in_16h5 }, - { name: '2024 AprilTag 6.5in (36h11)', value: TargetModel.kAprilTag6p5in_36h11 } + { name: '2023 AprilTag 6in (16h5)', value: TargetModel.AprilTag6in_16h5 }, + { name: '2024 AprilTag 6.5in (36h11)', value: TargetModel.AprilTag6p5in_36h11 } ]" :select-cols="interactiveCols" @input="(value) => useCameraSettingsStore().changeCurrentPipelineSetting({ targetModel: value }, false)" diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index 3e0a183347..860c87e757 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -26,8 +26,8 @@ export enum TargetModel { InfiniteRechargeHighGoalOuter = 2, CircularPowerCell7in = 3, RapidReactCircularCargoBall = 4, - kAprilTag6in_16h5 = 5, - kAprilTag6p5in_36h11 = 6 + AprilTag6in_16h5 = 5, + AprilTag6p5in_36h11 = 6 } export interface PipelineSettings { @@ -222,7 +222,7 @@ export type ConfigurableAprilTagPipelineSettings = Partial< export const DefaultAprilTagPipelineSettings: AprilTagPipelineSettings = { ...DefaultPipelineSettings, cameraGain: 75, - targetModel: TargetModel.kAprilTag6in_16h5, + targetModel: TargetModel.AprilTag6in_16h5, ledMode: false, outputShowMultipleTargets: true, cameraExposure: 20, @@ -265,7 +265,7 @@ export type ConfigurableArucoPipelineSettings = Partial