diff --git a/photon-client/src/components/dashboard/tabs/PnPTab.vue b/photon-client/src/components/dashboard/tabs/PnPTab.vue index e61179ac08..a2ee7b98ff 100644 --- a/photon-client/src/components/dashboard/tabs/PnPTab.vue +++ b/photon-client/src/components/dashboard/tabs/PnPTab.vue @@ -26,7 +26,8 @@ const interactiveCols = computed(() => { name: '2020 Power Cell (7in)', value: TargetModel.CircularPowerCell7in }, { name: '2022 Cargo Ball (9.5in)', value: TargetModel.RapidReactCircularCargoBall }, { name: '2023 AprilTag 6in (16h5)', value: TargetModel.AprilTag6in_16h5 }, - { name: '2024 AprilTag 6.5in (36h11)', value: TargetModel.AprilTag6p5in_36h11 } + { name: '2024 AprilTag 6.5in (36h11)', value: TargetModel.AprilTag6p5in_36h11 }, + { name: '2025 Algae (16.25in)', value: TargetModel.ReefscapeAlgae } ]" :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 65d1b54132..ca2e3f5ac5 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -27,7 +27,8 @@ export enum TargetModel { CircularPowerCell7in = 3, RapidReactCircularCargoBall = 4, AprilTag6in_16h5 = 5, - AprilTag6p5in_36h11 = 6 + AprilTag6p5in_36h11 = 6, + ReefscapeAlgae = 7 } export interface PipelineSettings { diff --git a/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java b/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java index 6d1e6985e7..04cc9bcd31 100644 --- a/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java +++ b/photon-core/src/main/java/org/photonvision/vision/target/TargetModel.java @@ -108,6 +108,25 @@ public enum TargetModel implements Releasable { -Units.inchesToMeters(9.5) / 2, -Units.inchesToMeters(9.5) / 2)), 0), + k2025Algae( + List.of( + new Point3( + -Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2), + new Point3( + -Units.inchesToMeters(16.25) / 2, + Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2), + new Point3( + Units.inchesToMeters(16.25) / 2, + Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2), + new Point3( + Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2, + -Units.inchesToMeters(16.25) / 2)), + 0), // 2023 AprilTag, with 6 inch marker width (inner black square). @JsonAlias({"k6in_16h5"}) kAprilTag6in_16h5(