diff --git a/src/main/java/com/team1816/lib/subsystems/drivetrain/Swerve.java b/src/main/java/com/team1816/lib/subsystems/drivetrain/Swerve.java index d8ca2ff..99c5fa6 100644 --- a/src/main/java/com/team1816/lib/subsystems/drivetrain/Swerve.java +++ b/src/main/java/com/team1816/lib/subsystems/drivetrain/Swerve.java @@ -106,7 +106,7 @@ private SwerveRequest GetSwerverCommand(SwerveRequest.FieldCentric drive) { rot = rotLimiter.calculate(rot); // 5. Multipliers to slow down movement based on driver preference. Slow mode and normal mode. - if (controller.leftTrigger().getAsBoolean()) { + if (controller.leftBumper().getAsBoolean()) { x *= SLOW_MODE_TRANSLATIONAL_MULTIPLIER; y *= SLOW_MODE_TRANSLATIONAL_MULTIPLIER; rot *= SLOW_MODE_ROTATIONAL_MULTIPLIER; diff --git a/src/main/java/com/team1816/season/RobotContainer.java b/src/main/java/com/team1816/season/RobotContainer.java index 43d6fea..fd3761d 100644 --- a/src/main/java/com/team1816/season/RobotContainer.java +++ b/src/main/java/com/team1816/season/RobotContainer.java @@ -55,7 +55,7 @@ public void teleopInit() { private void configureBindings() { // DRIVER CONTROLLER // Swerve - driverController.povDown().onTrue(Commands.runOnce(() -> + driverController.rightBumper().onTrue(Commands.runOnce(() -> superstructure.setSuperstructureWantedSwerveState(Superstructure.WantedSwerveState.BRAKE) )) .onFalse(Commands.runOnce(() -> @@ -96,8 +96,16 @@ private void configureBindings() { })); // Intake - driverController.leftBumper().onTrue(Commands.runOnce(() -> superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.INTAKE))); - driverController.rightBumper().onTrue(Commands.runOnce(() -> superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.STOW))); + driverController.leftTrigger().onTrue(Commands.runOnce(() -> + superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.INTAKE) + )) + .onFalse(Commands.runOnce(() -> + superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.STOW) + )); + + + //driverController.leftBumper().onTrue(Commands.runOnce(() -> superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.INTAKE))); + //driverController.rightBumper().onTrue(Commands.runOnce(() -> superstructure.setSuperstructureWantedIntakeState(Superstructure.WantedIntakeState.STOW))); // OPERATOR CONTROLLER diff --git a/src/main/resources/yaml/ztldr.yml b/src/main/resources/yaml/ztldr.yml index c32d289..7944a0c 100644 --- a/src/main/resources/yaml/ztldr.yml +++ b/src/main/resources/yaml/ztldr.yml @@ -298,7 +298,7 @@ subsystems: magneticSensor: sensorDirection: Clockwise_Positive absoluteSensorDiscontinuityPoint: 0.625 - magnetOffset: -0.35748674479 + magnetOffset: 0.397483 candi: id: 6 deviceType: CANdi