Merge branch 'main' of https://git.coldlightalchemist.com/Bradley/2024_Programming_Training_Demos
This commit is contained in:
commit
d43d9655ac
@ -40,11 +40,11 @@ public class RobotContainer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void configureBindings() {
|
private void configureBindings() {
|
||||||
climber.setDefaultCommand(climber.climberDown());
|
|
||||||
|
|
||||||
primary.a().onTrue(kicker.kick());
|
primary.a().onTrue(kicker.kick());
|
||||||
|
|
||||||
primary.b().whileTrue(climber.climberUp());
|
primary.b().onTrue(climber.climberUp());
|
||||||
|
|
||||||
|
primary.x().onTrue(climber.climberDown());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Command getAutonomousCommand() {
|
public Command getAutonomousCommand() {
|
||||||
|
@ -3,7 +3,6 @@ package frc.robot.subsystems;
|
|||||||
import java.util.function.DoubleSupplier;
|
import java.util.function.DoubleSupplier;
|
||||||
|
|
||||||
import edu.wpi.first.math.controller.PIDController;
|
import edu.wpi.first.math.controller.PIDController;
|
||||||
import edu.wpi.first.math.controller.SimpleMotorFeedforward;
|
|
||||||
import edu.wpi.first.wpilibj.ADXRS450_Gyro;
|
import edu.wpi.first.wpilibj.ADXRS450_Gyro;
|
||||||
import edu.wpi.first.wpilibj.drive.DifferentialDrive;
|
import edu.wpi.first.wpilibj.drive.DifferentialDrive;
|
||||||
import edu.wpi.first.wpilibj.motorcontrol.VictorSP;
|
import edu.wpi.first.wpilibj.motorcontrol.VictorSP;
|
||||||
@ -21,8 +20,6 @@ public class Drivetrain extends SubsystemBase {
|
|||||||
|
|
||||||
private PIDController turnController;
|
private PIDController turnController;
|
||||||
|
|
||||||
private SimpleMotorFeedforward turnFF;
|
|
||||||
|
|
||||||
private ADXRS450_Gyro gyro;
|
private ADXRS450_Gyro gyro;
|
||||||
|
|
||||||
public Drivetrain() {
|
public Drivetrain() {
|
||||||
|
Loading…
Reference in New Issue
Block a user