Merge branch 'master' into add-shooter-subsystem-PID-new

This commit is contained in:
Ridgebotics
2020-01-31 05:46:05 +00:00
committed by GitHub
5 changed files with 75 additions and 10 deletions
@@ -19,6 +19,7 @@ import frc4388.robot.commands.DistanceElevatorPID;
import frc4388.robot.commands.DriveAtVelocityPID;
import frc4388.robot.commands.DriveToDistanceMM;
import frc4388.robot.commands.DriveToDistancePID;
import frc4388.robot.commands.DriveWithJoystick;
import frc4388.robot.commands.RunIntakeWithTriggers;
import frc4388.robot.commands.ShooterVelocityControlPID;
import frc4388.robot.subsystems.Drive;
@@ -57,18 +58,13 @@ public class RobotContainer {
/* Default Commands */
// drives the robot with a two-axis input from the driver controller
m_robotDrive.setDefaultCommand(new RunCommand(() -> m_robotDrive.driveWithInput(
getDriverController().getLeftYAxis(),
getDriverController().getRightXAxis()), m_robotDrive));
// drives motor with input from triggers on the operator controller
m_robotDrive.setDefaultCommand(new DriveWithJoystick(m_robotDrive, getDriverController()));
// drives motor with input from triggers on the opperator controller
m_robotIntake.setDefaultCommand(new RunIntakeWithTriggers(m_robotIntake, getOperatorController()));
// moves elevator with one-axis input from the driver controller
m_robotElevator.setDefaultCommand(new RunCommand(() -> m_robotElevator.moveElevator(
getOperatorController().getLeftYAxis()), m_robotElevator
));
// continually sends updates to the Blinkin LED controller to keep the lights on
m_robotLED.setDefaultCommand(new RunCommand(() -> m_robotLED.updateLED(), m_robotLED));
}