projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add necessary commands/buttons
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
OI.java
diff --git
a/src/org/usfirst/frc/team3501/robot/OI.java
b/src/org/usfirst/frc/team3501/robot/OI.java
index a1abe0ad63a7b3e3a1fd22c450c5b547402d0a71..9f8ea7ae594b5d33d07fa18bcb79935745041915 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-2,11
+2,13
@@
package org.usfirst.frc.team3501.robot;
import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons;
import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons;
import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons;
import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons;
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
+import org.usfirst.frc.team3501.robot.commands.driving.ToggleDriveGear;
+import org.usfirst.frc.team3501.robot.commands.driving.ToggleGearManipulatorPiston;
import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
+import org.usfirst.frc.team3501.robot.commands.shooter.ReverseFlyWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
@@
-19,12
+21,15
@@
public class OI {
private static OI oi;
public static Joystick leftJoystick;
public static Joystick rightJoystick;
private static OI oi;
public static Joystick leftJoystick;
public static Joystick rightJoystick;
+ public static Joystick gamePad;
public static Button runIndexWheel;
public static Button reverseIndexWheel;
public static Button toggleFlyWheel;
public static Button runIndexWheel;
public static Button reverseIndexWheel;
public static Button toggleFlyWheel;
+ public static Button reverseFlyWheel;
public static Button toggleGear;
public static Button toggleGear;
+ public static Button toggleGearManipulatorPiston;
public static Button runIntake;
public static Button reverseIntake;
public static Button runIntake;
public static Button reverseIntake;
@@
-38,6
+43,7
@@
public class OI {
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
+ gamePad = new Joystick(Constants.OI.GAME_PAD_PORT);
runIndexWheel = new JoystickButton(rightJoystick,
Constants.OI.RUN_INDEXWHEEL_PORT);
runIndexWheel = new JoystickButton(rightJoystick,
Constants.OI.RUN_INDEXWHEEL_PORT);
@@
-47,13
+53,21
@@
public class OI {
Constants.OI.REVERSE_INDEXWHEEL_PORT);
reverseIndexWheel.whileHeld(new ReverseIndexWheelContinuous());
Constants.OI.REVERSE_INDEXWHEEL_PORT);
reverseIndexWheel.whileHeld(new ReverseIndexWheelContinuous());
- toggleFlyWheel = new JoystickButton(
rightJoystick
,
+ toggleFlyWheel = new JoystickButton(
gamePad
,
Constants.OI.TOGGLE_FLYWHEEL_PORT);
toggleFlyWheel.toggleWhenPressed(new RunFlyWheelContinuous());
Constants.OI.TOGGLE_FLYWHEEL_PORT);
toggleFlyWheel.toggleWhenPressed(new RunFlyWheelContinuous());
+ reverseFlyWheel = new JoystickButton(gamePad,
+ Constants.OI.REVERSE_FLYWHEEL_PORT);
+ reverseFlyWheel.whileHeld(new ReverseFlyWheelContinuous());
+
toggleGear = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_GEAR_PORT);
toggleGear = new JoystickButton(leftJoystick,
Constants.OI.TOGGLE_GEAR_PORT);
- toggleGear.whenPressed(new ToggleGear());
+ toggleGear.whenPressed(new ToggleDriveGear());
+
+ toggleGearManipulatorPiston = new JoystickButton(gamePad,
+ Constants.OI.TOGGLE_GEAR_MANIPULATOR_PORT);
+ toggleGearManipulatorPiston.whenPressed(new ToggleGearManipulatorPiston());
runIntake = new JoystickButton(leftJoystick, Constants.OI.RUN_INTAKE_PORT);
runIntake.whileHeld(new RunIntakeContinuous());
runIntake = new JoystickButton(leftJoystick, Constants.OI.RUN_INTAKE_PORT);
runIntake.whileHeld(new RunIntakeContinuous());
@@
-62,11
+76,11
@@
public class OI {
Constants.OI.REVERSE_INTAKE_PORT);
reverseIntake.whileHeld(new ReverseIntakeContinuous());
Constants.OI.REVERSE_INTAKE_PORT);
reverseIntake.whileHeld(new ReverseIntakeContinuous());
- increaseShooterSpeed = new JoystickButton(
leftJoystick
,
+ increaseShooterSpeed = new JoystickButton(
gamePad
,
Constants.OI.INCREASE_SHOOTER_SPEED_PORT);
increaseShooterSpeed.whenPressed(new IncreaseShootingSpeed());
Constants.OI.INCREASE_SHOOTER_SPEED_PORT);
increaseShooterSpeed.whenPressed(new IncreaseShootingSpeed());
- decreaseShooterSpeed = new JoystickButton(
leftJoystick
,
+ decreaseShooterSpeed = new JoystickButton(
gamePad
,
Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());