Merge branch 'master' into auto-programming

This commit is contained in:
Aarav Shah
2020-03-07 16:34:21 -07:00
10 changed files with 260 additions and 137 deletions
@@ -29,8 +29,9 @@ public class DisengageRachet extends CommandBase {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
if (m_climber.climberSafety) {
if (m_climber.m_climberSafety) {
m_climber.shiftServo(false);
System.err.println("Disengage Rachet");
}
}
@@ -44,6 +44,7 @@ public class RunClimberWithTriggers extends CommandBase {
if (leftTrigger > rightTrigger) {
output = -leftTrigger;
m_climber.shiftServo(true);
System.err.println("Engage Rachet");
}
} else {
output = rightTrigger;