From: WesleyWong-972 Date: Fri, 27 Mar 2026 23:34:53 +0000 (-0700) Subject: idoaijdoiaj X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=2dd6951808afb9552df6ae77475d20ab795ff159;p=FRC2026.git idoaijdoiaj --- diff --git a/src/main/java/frc/robot/commands/gpm/Superstructure.java b/src/main/java/frc/robot/commands/gpm/Superstructure.java index a65a01d..b67f931 100644 --- a/src/main/java/frc/robot/commands/gpm/Superstructure.java +++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java @@ -201,6 +201,7 @@ public class Superstructure extends Command { } @Override + public void execute() { TOFAdjustment = SmartDashboard.getNumber("OPERATOR: TOF Adjustment", TOFAdjustment); SmartDashboard.putNumber("OPERATOR: TOF Adjustment", TOFAdjustment); @@ -229,13 +230,10 @@ public class Superstructure extends Command { hood.setFieldRelativeTarget(Rotation2d.fromDegrees(ShotInterpolation.newHoodMap.get(distanceFromTarget)), hoodVelocity); double x = drivepose.getX(); // compared as meters double y = drivepose.getY(); - System.out.println("X: " + Units.metersToInches(x) + "Y: " + Units.metersToInches(y)); if (FieldConstants.underTrench(x, y)) { hood.forceHoodDown(true); - System.out.println("Hood forced down"); } else { hood.forceHoodDown(false); - System.out.println("Hood forced up"); } shooter.setShooter(-ShotInterpolation.shooterVelocityMap.get(distanceFromTarget)); Logger.recordOutput("Distance From Target", distanceFromTarget); diff --git a/src/main/java/frc/robot/subsystems/Intake/Intake.java b/src/main/java/frc/robot/subsystems/Intake/Intake.java index 7904f3b..35ae912 100644 --- a/src/main/java/frc/robot/subsystems/Intake/Intake.java +++ b/src/main/java/frc/robot/subsystems/Intake/Intake.java @@ -239,7 +239,7 @@ public class Intake extends SubsystemBase implements IntakeIO{ * @param setpoint in inches */ public void setPosition(double setpoint) { - double motorRotations = inchesToRotations(setpoint); + double motorRotations = -inchesToRotations(setpoint); rightMotor.setControl(voltageRequest.withPosition(motorRotations)); leftMotor.setControl(voltageRequest.withPosition(motorRotations)); diff --git a/src/main/java/frc/robot/subsystems/turret/Turret.java b/src/main/java/frc/robot/subsystems/turret/Turret.java index f6817c7..64177da 100644 --- a/src/main/java/frc/robot/subsystems/turret/Turret.java +++ b/src/main/java/frc/robot/subsystems/turret/Turret.java @@ -208,9 +208,9 @@ public class Turret extends SubsystemBase implements TurretIO{ } } else { // Sets motor control with feedforward - motor.setControl(mmVoltageRequest - .withPosition(motorGoalRotations) - .withFeedForward(robotTurnCompensation)); + // motor.setControl(mmVoltageRequest + // .withPosition(motorGoalRotations) + // .withFeedForward(robotTurnCompensation)); } Logger.recordOutput("Turret/Voltage", motor.getMotorVoltage().getValue());