diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-30 13:17:50 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-01-30 13:17:50 -0500 |
| commit | 1e1db45c3b5aa8b15da06818023deb1140823a5f (patch) | |
| tree | f2420be6ae36b0919dccf53da331e5c227742c2d | |
| parent | def1822b3c0236387bf18488de1d02dfa3560c94 (diff) | |
| parent | 26b916b43fdcafd9091e10564e68cc351beb9023 (diff) | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/org/usfirst/frc/team4272/robot2016/HwRobot.java
# src/org/usfirst/frc/team4272/robot2016/Teleop.java
| -rw-r--r-- | src/org/usfirst/frc/team4272/robot2016/HwRobot.java | 4 | ||||
| -rw-r--r-- | src/org/usfirst/frc/team4272/robot2016/Teleop.java | 4 | ||||
| -rw-r--r-- | src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java index a59ecb1..90eafe1 100644 --- a/src/org/usfirst/frc/team4272/robot2016/HwRobot.java +++ b/src/org/usfirst/frc/team4272/robot2016/HwRobot.java @@ -2,9 +2,9 @@ package org.usfirst.frc.team4272.robot2016; import org.usfirst.frc.team4272.robotlib.PIDOutputSplitter; -import edu.wpi.first.wpilibj.Encoder; +//import edu.wpi.first.wpilibj.Encoder; import edu.wpi.first.wpilibj.PIDOutput; -import edu.wpi.first.wpilibj.PIDSourceType; +//import edu.wpi.first.wpilibj.PIDSourceType; import edu.wpi.first.wpilibj.Talon; public class HwRobot { diff --git a/src/org/usfirst/frc/team4272/robot2016/Teleop.java b/src/org/usfirst/frc/team4272/robot2016/Teleop.java index 8c6e73b..41919fa 100644 --- a/src/org/usfirst/frc/team4272/robot2016/Teleop.java +++ b/src/org/usfirst/frc/team4272/robot2016/Teleop.java @@ -1,13 +1,13 @@ package org.usfirst.frc.team4272.robot2016; -import org.usfirst.frc.team4272.robotlib.PushButton; +//import org.usfirst.frc.team4272.robotlib.PushButton; import org.usfirst.frc.team4272.robotlib.Xbox360Controller.Axis; import org.usfirst.frc.team4272.robotlib.Xbox360Controller.Button; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj.Joystick; public class Teleop { - private PushButton camButton = new PushButton(); + //private PushButton camButton = new PushButton(); public Teleop() { } diff --git a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java index 8c54b5f..b5c1d13 100644 --- a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java +++ b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java @@ -34,7 +34,6 @@ package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.GenericHID; -import edu.wpi.first.wpilibj.GenericHID.Hand; import edu.wpi.first.wpilibj.Joystick; /** |