eaglesfe
/
robotcode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename

This commit is contained in:
Scott Barnes 2023-11-15 15:23:46 -06:00
parent 5238efc1cc
commit 5ea81285ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Camera.java
View File

@ -24,7 +24,7 @@ public class Camera {
@Getter @Getter
@Setter @Setter
private CenterStageCommon.Alliance alliance; private CenterStageCommon.Alliance alliance;
private PropDetectionPipeline colorDetectionPipeline; private PropDetectionPipeline prop;
private AprilTagProcessor aprilTag; private AprilTagProcessor aprilTag;
private VisionPortal visionPortal; private VisionPortal visionPortal;
private Telemetry telemetry; private Telemetry telemetry;
@ -43,9 +43,9 @@ public class Camera {
.setDrawTagID(true) .setDrawTagID(true)
.setDrawTagOutline(true) .setDrawTagOutline(true)
.build(); .build();
this.colorDetectionPipeline = new PropDetectionPipeline(); this.prop = new PropDetectionPipeline();
this.visionPortal = VisionPortal.easyCreateWithDefaults( this.visionPortal = VisionPortal.easyCreateWithDefaults(
hardwareMap.get(WebcamName.class, WEBCAM_NAME), aprilTag, colorDetectionPipeline); hardwareMap.get(WebcamName.class, WEBCAM_NAME), aprilTag, prop);
this.initialized = true; this.initialized = true;
} }
@ -57,9 +57,9 @@ public class Camera {
switch (alliance) { switch (alliance) {
case Blue: case Blue:
return this.colorDetectionPipeline.getBlue(); return this.prop.getBlue();
case Red: case Red:
return this.colorDetectionPipeline.getRed(); return this.prop.getRed();
} }
return INVALID_DETECTION; return INVALID_DETECTION;