diff --git a/photon-client/src/views/PipelineViews/AprilTagTab.vue b/photon-client/src/views/PipelineViews/AprilTagTab.vue index aa842868b..2fd47b736 100644 --- a/photon-client/src/views/PipelineViews/AprilTagTab.vue +++ b/photon-client/src/views/PipelineViews/AprilTagTab.vue @@ -1,196 +1,166 @@ diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java index 165bd304f..0ed76354d 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/AprilTagPipeline.java @@ -69,28 +69,7 @@ public class AprilTagPipeline extends CVPipeline { - if (it.cameraGain == -1) it.cameraGain = 20; // Sane default + if (it.cameraGain == -1) it.cameraGain = 75; // Sane default }); } if (cameraQuirks.hasQuirk(CameraQuirk.AWBGain)) { pipelineManager.userPipelineSettings.forEach( it -> { - if (it.cameraRedGain == -1) it.cameraRedGain = 16; // Sane defaults - if (it.cameraBlueGain == -1) it.cameraBlueGain = 16; + if (it.cameraRedGain == -1) it.cameraRedGain = 11; // Sane defaults + if (it.cameraBlueGain == -1) it.cameraBlueGain = 20; }); } @@ -401,7 +401,7 @@ public class VisionModule { } if (cameraQuirks.hasQuirk(CameraQuirk.Gain)) { // If the gain is disabled for some reason, re-enable it - if (pipelineSettings.cameraGain == -1) pipelineSettings.cameraGain = 20; + if (pipelineSettings.cameraGain == -1) pipelineSettings.cameraGain = 75; visionSource.getSettables().setGain(Math.max(0, pipelineSettings.cameraGain)); } else { pipelineSettings.cameraGain = -1; @@ -409,8 +409,8 @@ public class VisionModule { if (cameraQuirks.hasQuirk(CameraQuirk.AWBGain)) { // If the AWB gains are disabled for some reason, re-enable it - if (pipelineSettings.cameraRedGain == -1) pipelineSettings.cameraRedGain = 16; - if (pipelineSettings.cameraBlueGain == -1) pipelineSettings.cameraBlueGain = 16; + if (pipelineSettings.cameraRedGain == -1) pipelineSettings.cameraRedGain = 11; + if (pipelineSettings.cameraBlueGain == -1) pipelineSettings.cameraBlueGain = 20; visionSource.getSettables().setRedGain(Math.max(0, pipelineSettings.cameraRedGain)); visionSource.getSettables().setBlueGain(Math.max(0, pipelineSettings.cameraBlueGain)); } else { diff --git a/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java b/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java index 9fede51cd..792ca95fb 100644 --- a/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java +++ b/photon-core/src/test/java/org/photonvision/vision/pipeline/AprilTagTest.java @@ -24,6 +24,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.photonvision.common.util.TestUtils; +import org.photonvision.vision.apriltag.AprilTagFamily; import org.photonvision.vision.camera.QuirkyCamera; import org.photonvision.vision.frame.provider.FileFrameProvider; import org.photonvision.vision.pipeline.result.CVPipelineResult; @@ -46,6 +47,7 @@ public class AprilTagTest { pipeline.getSettings().cornerDetectionAccuracyPercentage = 4; pipeline.getSettings().cornerDetectionUseConvexHulls = true; pipeline.getSettings().targetModel = TargetModel.k200mmAprilTag; + pipeline.getSettings().tagFamily = AprilTagFamily.kTag36h11; var frameProvider = new FileFrameProvider(