Merge pull request #76 from AGausmann/competition

Competition fixups
frc-4931 · Mar 13, 2016 · 709088f · 709088f
2 parents c35a6da + fc11002
commit 709088f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CompetitionRobot/src/org/frc4931/robot/drive/AutoChevalDeFrise.java b/CompetitionRobot/src/org/frc4931/robot/drive/AutoChevalDeFrise.java
@@ -48,6 +48,7 @@ public AutoChevalDeFrise(DriveSystem drive, Arm arm, DistanceSensor distanceToOb
                                     })),
                      new MoveArmTo(arm, Robot.ARM_CHEVAL_DOWN_ANGLE),
                      Command.pause(1.0),
+                     new TimedDrive(drive, 0.8, 0.5),
                      simultaneously(new MoveArmTo(arm, 5.0),
                                     new TimedDrive(drive, 0.8, 1.5)));
     }

diff --git a/CompetitionRobot/src/org/frc4931/robot/roller/Roller.java b/CompetitionRobot/src/org/frc4931/robot/roller/Roller.java
@@ -39,14 +39,14 @@ public Roller(Motor rollerMotor, Switch ballIn) {
 	 * Pulls a ball in.
 	 */
 	public void suck() {
-		wheels.setSpeed(-1.0);
+		wheels.setSpeed(1.0);
 	}
 
 	/*
 	 * Pushes a ball out.
 	 */
 	public void spit() {
-		wheels.setSpeed(1.0);
+		wheels.setSpeed(-1.0);
 	}
 
 	/*