diff --git a/chameleon-server/chameleon-vision.iml b/chameleon-server/chameleon-vision.iml index e14bee233..11b1a05d0 100644 --- a/chameleon-server/chameleon-vision.iml +++ b/chameleon-server/chameleon-vision.iml @@ -12,20 +12,6 @@ - - - - - - - - - - - - - - diff --git a/chameleon-server/pom.xml b/chameleon-server/pom.xml index e95b6f171..c5a1f3c64 100644 --- a/chameleon-server/pom.xml +++ b/chameleon-server/pom.xml @@ -5,6 +5,7 @@ 4.0.0 org.chameleon-vision.main chameleon-vision + 2.2-RELEASE diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java index 66478c2d9..a1776398c 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/VisionProcess.java @@ -25,7 +25,6 @@ import edu.wpi.first.wpilibj.geometry.Pose2d; import edu.wpi.first.wpiutil.CircularBuffer; import org.apache.commons.lang3.tuple.Pair; import org.opencv.core.Mat; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -212,9 +211,8 @@ public class VisionProcess { } center.add(bestTarget.minAreaRect.center.x); center.add(bestTarget.minAreaRect.center.y); - } catch (ClassCastException ignored) { - + } } else { pointMap.put("pitch", null); diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java index eded3b1a8..110e885e1 100644 --- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java +++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/SolvePNPPipe.java @@ -48,6 +48,7 @@ public class SolvePNPPipe implements Pipe corners = List.of( + new Point3(-19.625, 0, 0), new Point3(-9.819867, -17, 0), new Point3(9.819867, -17, 0), @@ -176,6 +177,7 @@ public class SolvePNPPipe implements Pipe