Import necessary commands in OI2017 class

blair-robot-project · Jan 27, 2017 · d6c6048 · d6c6048
1 parent 0601cd3
commit d6c6048
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 26 16:41:48 EST 2017
+#Thu Jan 26 19:00:12 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/src/main/java/org/usfirst/frc/team449/robot/oi/OI2017.java b/src/main/java/org/usfirst/frc/team449/robot/oi/OI2017.java
@@ -7,6 +7,7 @@
 import org.usfirst.frc.team449.robot.drive.talonCluster.commands.NavXDriveStraight;
 import org.usfirst.frc.team449.robot.drive.talonCluster.commands.NavXRelativeTTA;
 import org.usfirst.frc.team449.robot.drive.talonCluster.commands.NavXTurnToAngle;
+import org.usfirst.frc.team449.robot.mechanism.climber.commands.Climb;
 import org.usfirst.frc.team449.robot.oi.components.PolyThrottle;
 import org.usfirst.frc.team449.robot.oi.components.Throttle;
 
@@ -44,10 +45,10 @@ public OI2017(maps.org.usfirst.frc.team449.robot.oi.OI2017Map.OI2017 map) {
 		buttonPad = new Joystick(map.getButtonPad());
 		leftThrottle = new PolyThrottle(leftStick, 1, 1);
 		rightThrottle = new PolyThrottle(rightStick, 1, 1);
-//		leftThrottle = new SmoothedThrottle(leftStick, 1);
-//		rightThrottle = new SmoothedThrottle(rightStick, 1);
-//		leftThrottle = new ExpThrottle(leftStick, 1, 50);
-//		rightThrottle = new ExpThrottle(rightStick, 1, 50);
+		//		leftThrottle = new SmoothedThrottle(leftStick, 1);
+		//		rightThrottle = new SmoothedThrottle(rightStick, 1);
+		//		leftThrottle = new ExpThrottle(leftStick, 1, 50);
+		//		rightThrottle = new ExpThrottle(rightStick, 1, 50);
 		turnaround = new JoystickButton(leftStick, map.getTurnaroundButton());
 		tt0 = new JoystickButton(leftStick, map.getTurnTo0Button());
 		tt30 = new JoystickButton(leftStick, map.getTurnTo30Button());
@@ -66,8 +67,10 @@ public void mapButtons() {
 		tt330.whenPressed(new NavXTurnToAngle(Robot.driveSubsystem.turnPID, -30, Robot.driveSubsystem, 2.5));
 		driveStraight.whileHeld(new NavXDriveStraight(Robot.driveSubsystem.straightPID, Robot.driveSubsystem, this));
 		climbButton.whileHeld(new Climb(Robot.climberSubsystem));
-		toggleFlywheel.whenPressed(new ToggleFlywheel(Robot.doubleFlywheelShooterSubsystem));
-		toggleFlywheel.whenPressed(new ToggleFlywheel(Robot.singleFlywheelShooterSubsystem));
+		toggleFlywheel.whenPressed(new org.usfirst.frc.team449.robot.mechanism.doubleflywheelshooter.commands
+				.ToggleFlywheel(Robot.doubleFlywheelShooterSubsystem));
+		toggleFlywheel.whenPressed(new org.usfirst.frc.team449.robot.mechanism.singleflywheelshooter.commands
+				.ToggleFlywheel(Robot.singleFlywheelShooterSubsystem));
 	}
 
 	@Override