Skip to content

Commit 6e6437e

Browse files
committed
Incorporate some of photonvision code from Lucas
1 parent 83c50b9 commit 6e6437e

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

src/main/java/frc/robot/RobotContainer.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
import com.ctre.phoenix6.swerve.SwerveRequest;
99
import com.pathplanner.lib.auto.AutoBuilder;
1010
import edu.wpi.first.math.filter.SlewRateLimiter;
11+
import edu.wpi.first.math.geometry.Pose2d;
12+
import edu.wpi.first.math.geometry.Rotation2d;
1113
import edu.wpi.first.wpilibj.RobotState;
1214
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
1315
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
1416
import edu.wpi.first.wpilibj.util.Color;
1517
import edu.wpi.first.wpilibj2.command.*;
1618
import edu.wpi.first.wpilibj2.command.button.Trigger;
19+
import frc.robot.commands.MoveToPoseRelativeToAprilTagCommand;
1720
import frc.robot.commands.ledCommands.BlinkLEDCommand;
1821
import frc.robot.commands.ledCommands.SetLEDPatternCommand;
1922
import frc.robot.generated.TunerConstants;
@@ -29,7 +32,7 @@ public class RobotContainer {
2932
public final Drivetrain drivetrain = TunerConstants.createDrivetrain();
3033
public final EndEffector endEffector = new EndEffector();
3134
public final Climber climber = new Climber();
32-
// public final VisionSubsystem vision = new VisionSubsystem(drivetrain);
35+
public final VisionSubsystem vision = new VisionSubsystem(drivetrain);
3336
public final Elevator elevator = new Elevator();
3437
public final Pivot pivot = new Pivot();
3538
public final Ratchet ratchet = new Ratchet();
@@ -138,14 +141,14 @@ private void configureBindings() {
138141
* RIGHT JOYSTICK RIGHT - RESET FIELD CENTRIC HEADING
139142
*/
140143

141-
driverJoystickLeft.leftButton().onTrue(
142-
new InstantCommand(() -> Drivetrain.isRobotCentric = false));
143-
driverJoystickLeft.rightButton().onTrue(
144-
new InstantCommand(() -> Drivetrain.isRobotCentric = true));
145-
driverJoystickRight.leftButton().onTrue(
146-
new InstantCommand( () -> Drivetrain.isSlowMode = !Drivetrain.isSlowMode));
147-
driverJoystickRight.rightButton().onTrue(
148-
new InstantCommand(drivetrain::seedFieldCentric));
144+
driverJoystickLeft.leftButton().whileTrue(
145+
new MoveToPoseRelativeToAprilTagCommand(vision, drivetrain, 6, new Pose2d(0.0, 0.0, Rotation2d.fromDegrees(0.0))));
146+
// driverJoystickLeft.rightButton().onTrue(
147+
// new InstantCommand(() -> Drivetrain.isRobotCentric = true));
148+
// driverJoystickRight.leftButton().onTrue(
149+
// new InstantCommand( () -> Drivetrain.isSlowMode = !Drivetrain.isSlowMode));
150+
// driverJoystickRight.rightButton().onTrue(
151+
// new InstantCommand(drivetrain::seedFieldCentric));
149152

150153
// ==================== Climber Bindings ====================
151154

src/main/java/frc/robot/subsystems/VisionSubsystem.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
77
import edu.wpi.first.wpilibj2.command.SubsystemBase;
88

9+
import java.util.Collections;
910
import java.util.List;
1011
import java.util.Optional;
1112

@@ -23,8 +24,8 @@ public class VisionSubsystem extends SubsystemBase {
2324
private final PhotonCamera camera_2;
2425
private final PhotonCamera camera_1;
2526
private final Drivetrain drivetrain;
26-
private List<PhotonPipelineResult> latestCamera1Results;
27-
private List<PhotonPipelineResult> latestCamera2Results;
27+
private List<PhotonPipelineResult> latestCamera1Results = Collections.emptyList();
28+
private List<PhotonPipelineResult> latestCamera2Results = Collections.emptyList();
2829
AprilTagFieldLayout aprilTagFieldLayout = AprilTagFieldLayout.loadField(AprilTagFields.kDefaultField);
2930
PhotonPoseEstimator poseEstimator = new PhotonPoseEstimator(aprilTagFieldLayout, PoseStrategy.MULTI_TAG_PNP_ON_COPROCESSOR, new Transform3d());
3031

0 commit comments

Comments
 (0)