Skip to content

Commit

Permalink
Work from today
Browse files Browse the repository at this point in the history
  • Loading branch information
Coolearthsky committed Jan 28, 2025
1 parent 9a44b07 commit 46566a0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion comp/src/main/java/org/team100/frc2025/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public RobotContainer(TimedRobot100 robot) throws IOException {
// ObjectPosition24ArrayListener objectPosition24ArrayListener = new ObjectPosition24ArrayListener(poseEstimator);

//DRIVER BUTTONS
whileTrue(driverControl::driveToObject, new DriveWithProfile2(fieldLog, () -> (Optional.of(new Pose2d(11.5,5, new Rotation2d()))), m_drive, new FullStateDriveController(hlog),swerveKinodynamics));
whileTrue(driverControl::driveToObject, new DriveWithProfile2(fieldLog, () -> (Optional.of(new Pose2d(1,4x, new Rotation2d()))), m_drive, new FullStateDriveController(hlog),swerveKinodynamics));
onTrue(driverControl::resetRotation0, new ResetPose(m_drive, 0, 0, 0));
onTrue(driverControl::resetRotation180, new SetRotation(m_drive, GeometryUtil.kRotation180));
whileTrue(driverControl::driveWithFancyTrajec,
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/org/team100/lib/config/Camera.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public enum Camera {
/**
* Camera bot intake
*/
GLOBAL_GAME_PIECE("364f07fb090a3bf7",
GLOBAL_GAME_PIECE("d44649628c20d4d4",
new Transform3d(
new Translation3d(0.2, -0.05, 0.381),
new Rotation3d(0, Math.toRadians(20), 0))),

/**
* Camera bot right april tag detector
*/
GLOBAL_RIGHT("d44649628c20d4d4",
GLOBAL_RIGHT("364f07fb090a3bf7",
new Transform3d(
new Translation3d(0.15, -0.095, 0.381),
new Rotation3d(0, Math.toRadians(-20), Math.toRadians(-30)))),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public static SwerveModuleCollection get(
kinodynamics,
EncoderDrive.INVERSE, MotorPhase.REVERSE));
case SWERVE_ONE:
Util.println("************** WCP MODULES w/Analog Encoders **************");
Util.println("************** WCP MODULES w/Duty-Cycle Encoders **************");
return new SwerveModuleCollection(
WCPSwerveModule100.getFalconDrive(frontLeftLogger,
currentLimit,
Expand Down Expand Up @@ -134,7 +134,7 @@ public static SwerveModuleCollection get(
DriveRatio.FAST, DutyCycleRotaryPositionSensor.class,
33,
9,
0.242,
0.170,
kinodynamics,
EncoderDrive.INVERSE, MotorPhase.REVERSE));
case BETA_BOT:
Expand Down

0 comments on commit 46566a0

Please sign in to comment.