Merge branch 'master' into bouncePath

This commit is contained in:
Ryan
2021-04-22 16:42:43 -06:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
@@ -197,8 +197,7 @@ public class RobotContainer {
// continually sends updates to the Blinkin LED controller to keep the lights on // continually sends updates to the Blinkin LED controller to keep the lights on
m_robotLED.setDefaultCommand(new RunCommand(() -> m_robotLED.updateLED(), m_robotLED)); m_robotLED.setDefaultCommand(new RunCommand(() -> m_robotLED.updateLED(), m_robotLED));
// runs the storage not // runs the storage not
m_robotStorage.setDefaultCommand(new ManageStorage(m_robotStorage));
m_robotStorage.setDefaultCommand(new RunCommand(() -> m_robotStorage.runStorage(0), m_robotStorage));
m_robotLime.setDefaultCommand(new RunCommand(() -> m_robotLime.limeOff(), m_robotLime)); m_robotLime.setDefaultCommand(new RunCommand(() -> m_robotLime.limeOff(), m_robotLime));
} }
@@ -419,7 +418,7 @@ public class RobotContainer {
"TenBallMidComplete" "TenBallMidComplete"
}; };
m_tenBallAutoMiddle = new TenBallAutoMiddle(m_robotDrive, buildPaths(tenBallAutoMiddlePaths)); //m_tenBallAutoMiddle = new TenBallAutoMiddle(m_robotDrive, buildPaths(tenBallAutoMiddlePaths));
String[] sequentialTestPaths = new String[]{ String[] sequentialTestPaths = new String[]{
"Seq1", "Seq1",
@@ -345,6 +345,7 @@ public class Drive extends SubsystemBase {
public void updateOdometry(boolean reversed){ public void updateOdometry(boolean reversed){
if (reversed){ if (reversed){
m_odometry.update(Rotation2d.fromDegrees( -getGyroYaw()-180), m_odometry.update(Rotation2d.fromDegrees( -getGyroYaw()-180),
-inchesToMeters(getDistanceInches(m_rightFrontMotor)), -inchesToMeters(getDistanceInches(m_rightFrontMotor)),
inchesToMeters(getDistanceInches(m_leftFrontMotor))); inchesToMeters(getDistanceInches(m_leftFrontMotor)));