Merge branch 'master' of https://git.team4272.com/2017/frc4272-robot2017

2 files changed, 0 insertions, 18 deletions

diff --git a/src/org/usfirst/frc/team4272/robot2017/HwRobot.java b/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
index aeb8934..533cf9d 100644
--- a/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
+++ b/src/org/usfirst/frc/team4272/robot2017/HwRobot.java
@@ -29,7 +29,6 @@
  */
 package org.usfirst.frc.team4272.robot2017;
 
-import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.DriverStation;
 import edu.wpi.first.wpilibj.Encoder;
@@ -41,8 +40,6 @@ import edu.wpi.first.wpilibj.Talon;
 import edu.wpi.first.wpilibj.networktables.NetworkTable;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
-import org.usfirst.frc.team4272.robotlib.PIDOutputSplitter;
-import org.usfirst.frc.team4272.robotlib.PIDServo;
 import org.usfirst.frc.team4272.robotlib.RollingAvg;
 
 public class HwRobot {
diff --git a/src/org/usfirst/frc/team4272/robot2017/Teleop.java b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
index 48c1c54..4dc3627 100644
--- a/src/org/usfirst/frc/team4272/robot2017/Teleop.java
+++ b/src/org/usfirst/frc/team4272/robot2017/Teleop.java
@@ -33,19 +33,12 @@ import edu.wpi.first.wpilibj.GenericHID.Hand;
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.Preferences;
-import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-
-import org.usfirst.frc.team4272.robotlib.PushButton;
 
 public class Teleop {
 	private final HwRobot robot;
 	private final Timer timer = new Timer();
 	private final Preferences prefs = Preferences.getInstance();
 
-	private double lastTime;
-	private double currentTime;
-	private boolean state = false;
-
 	public Teleop(HwRobot robot) {
 		this.robot = robot;
 		timer.start();
@@ -57,14 +50,6 @@ public class Teleop {
 		return Math.copySign(Math.pow(Math.abs(y), 2.0-z), y);
 	}
 
-	private static double bound(double min, double v, double max) {
-		return Math.min(Math.max(v, min), max);
-	}
-
-	private static double oneIf(boolean b) {
-		return b ? 1 : 0;
-	}
-	
 	public Control run(Control control, HwOI oi) {
 		/* drive */
 		control.lDrive = -jsScale(oi.lStick);