Match frontend TargetModel enum with backend

PhotonVision · Oct 20, 2023 · 696581c · 696581c
1 parent 8326107
commit 696581c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git 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
@@ -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 {