From 696581ccc3e9d2cd7d9c8e8951b52006f2400646 Mon Sep 17 00:00:00 2001 From: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:28:08 -0400 Subject: [PATCH] Match frontend TargetModel enum with backend --- .../src/components/dashboard/tabs/PnPTab.vue | 5 ++--- photon-client/src/types/PipelineTypes.ts | 17 ++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/photon-client/src/components/dashboard/tabs/PnPTab.vue b/photon-client/src/components/dashboard/tabs/PnPTab.vue index d724eb8d09..c242344a92 100644 --- a/photon-client/src/components/dashboard/tabs/PnPTab.vue +++ b/photon-client/src/components/dashboard/tabs/PnPTab.vue @@ -21,12 +21,11 @@ const interactiveCols = computed( v-model="useCameraSettingsStore().currentPipelineSettings.targetModel" label="Target Model" :items="[ - { name: '2020 High Goal Outer', value: TargetModel.InfiniteRechargeHighGoalOuter }, - { name: '2020 High Goal Inner', value: TargetModel.InfiniteRechargeHighGoalInner }, + { name: '2016 High Goal', value: TargetModel.StrongholdHighGoal }, { name: '2019 Dual Target', value: TargetModel.DeepSpaceDualTarget }, + { 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: '2016 High Goal', value: TargetModel.StrongholdHighGoal }, { name: '200mm AprilTag', value: TargetModel.Apriltag_200mm }, { name: '6in (16h5) Aruco', value: TargetModel.Aruco6in_16h5 }, { name: '6in (16h5) AprilTag', value: TargetModel.Apriltag6in_16h5 }, diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index 75d18de504..93e56c37c2 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -21,17 +21,16 @@ export enum RobotOffsetPointMode { } export enum TargetModel { - InfiniteRechargeHighGoalOuter = 0, - InfiniteRechargeHighGoalInner = 1, - DeepSpaceDualTarget = 2, + StrongholdHighGoal = 0, + DeepSpaceDualTarget = 1, + InfiniteRechargeHighGoalOuter = 2, CircularPowerCell7in = 3, RapidReactCircularCargoBall = 4, - StrongholdHighGoal = 5, - Apriltag_200mm = 6, - Aruco6in_16h5 = 7, - Apriltag6in_16h5 = 8, - Aruco6p5in_36h11 = 9, - Apriltag6p5in_36h11 = 10 + Apriltag_200mm = 5, + Aruco6in_16h5 = 6, + Apriltag6in_16h5 = 7, + Aruco6p5in_36h11 = 8, + Apriltag6p5in_36h11 = 9 } export interface PipelineSettings {