shootTags added

Team3128 · Mar 27, 2024 · dc12580 · dc12580
1 parent ee4596e
commit dc12580
Showing 1 changed file with 32 additions and 4 deletions.
diff --git a/src/main/java/common/hardware/camera/Camera.java b/src/main/java/common/hardware/camera/Camera.java
@@ -5,6 +5,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import org.littletonrobotics.junction.Logger;
 import org.photonvision.EstimatedRobotPose;
@@ -31,6 +32,12 @@
  */
 public class Camera {
 
+    public static boolean areShootTagsSeen = false;
+
+    private static ArrayList<Integer> shootTags = new ArrayList<Integer>();
+
+    private static HashMap<Camera, Boolean> shootTagsSeen = new HashMap<Camera, Boolean>();
+
     public static int updateCounter = 0;
 
     public static double validDist = 0.5;
@@ -49,7 +56,7 @@ public class Camera {
     private static Supplier<Pose2d> robotPose;
     private static double ambiguityThreshold = 0.2;
 
-    private static ArrayList<Double> ignoredTags = new ArrayList<Double>();
+    private static ArrayList<Integer> ignoredTags = new ArrayList<Integer>();
 
     public static final LinkedList<Camera> cameras = new LinkedList<Camera>();
 
@@ -71,6 +78,7 @@ public Camera(String name, double xOffset, double yOffset, double yawOffset, dou
         }
 
         cameras.add(this);
+        shootTagsSeen.put(this, false);
     }
 
     public static void configCameras(AprilTagFields aprilTagLayout, PoseStrategy calc_strategy, BiConsumer<Pose2d, Double> odometry, Supplier<Pose2d> robotPose){
@@ -80,12 +88,28 @@ public static void configCameras(AprilTagFields aprilTagLayout, PoseStrategy cal
         Camera.robotPose = robotPose;
     }
 
-    public static void addIgnoredTags(double ...ignoredTags) {
-        for(final double tag : ignoredTags) {
+    public static void addIgnoredTags(int ...ignoredTags) {
+        for(final int tag : ignoredTags) {
             Camera.ignoredTags.add(tag);
         }
     }
 
+    public static void addShootTags(int ...shootTags) {
+        for(final int tag : shootTags) {
+            Camera.shootTags.add(tag);
+        }
+    }
+
+    public static void checkShootTagsAll(){
+        for (final Camera camera : cameras) {
+            if(shootTagsSeen.get(camera)) {
+                areShootTagsSeen = true;
+                return;
+            }
+        }
+        areShootTagsSeen = false;
+    }
+
     public static void updateAll(){
         for (final Camera camera : cameras) {
             camera.update();
@@ -120,9 +144,13 @@ private Optional<EstimatedRobotPose> getEstimatedPose(PhotonPipelineResult resul
         for (PhotonTrackedTarget target : result.targets) {
             double targetPoseAmbiguity = target.getPoseAmbiguity();
             double dist = target.getBestCameraToTarget().getTranslation().toTranslation2d().getNorm();
-            if (dist > distanceThreshold || targetPoseAmbiguity > ambiguityThreshold || ignoredTags.contains(Double.valueOf(target.getFiducialId()))) continue;
+            if (dist > distanceThreshold || targetPoseAmbiguity > ambiguityThreshold || ignoredTags.contains(Integer.valueOf(target.getFiducialId()))) continue;
             // Make sure the target is a Fiducial target.
 
+            if(shootTags.contains(Integer.valueOf(target.getFiducialId()))) {
+                shootTagsSeen.put(this, true);
+            }
+
             if (targetPoseAmbiguity != -1 && targetPoseAmbiguity < lowestAmbiguityScore) {
                 lowestAmbiguityScore = targetPoseAmbiguity;
                 lowestAmbiguityTarget = target;