Merge branch 'add-shooter' of https://github.com/Team4388/RiseOfRidgebotics2020 into add-shooter

This commit is contained in:
ryan123rudder
2020-02-29 18:43:38 -07:00
3 changed files with 3 additions and 5 deletions
+1 -1
View File
@@ -159,7 +159,7 @@ public final class Constants {
/* PID Gains */
public static final double STORAGE_MIN_OUTPUT = -1.0;
public static final Gains STORAGE_GAINS = new Gains(1, 0.0, 0.0, 0.0, 0, 1.0);
public static final Gains STORAGE_GAINS = new Gains(0.1, 0.0, 0.0, 0.0, 0, 1.0);
}
public static final class LEDConstants {
@@ -205,8 +205,6 @@ public class RobotContainer {
new JoystickButton(getOperatorJoystick(), XboxController.START_BUTTON)
.whileHeld(new CalibrateShooter(m_robotShooter, m_robotShooterAim));
}
/**
@@ -42,10 +42,10 @@ public class StoragePositionPID extends CommandBase {
// Returns true when the command should end.
@Override
public boolean isFinished() {
if (startPos + StorageConstants.STORAGE_FULL_BALL == m_storage.getEncoderPos())
/*if (startPos + StorageConstants.STORAGE_FULL_BALL == m_storage.getEncoderPos())
{
return true;
}
}*/
return false;
}
}