From 7fc310342a2698d1e08fe8cbf7d28d940e105e73 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 09:42:50 -0500 Subject: [PATCH 01/46] Fix an NPE --- .../frc/team3494/robot/commands/auto/AngleTurn.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java index f452f74..fb78840 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java @@ -15,13 +15,18 @@ public class AngleTurn extends Command { private double angle; - private static double tolerance = Robot.prefs.getDouble("angle tolerance", 2.5); + private static double tolerance; public AngleTurn(double angle) { // Use requires() here to declare subsystem dependencies // eg. requires(chassis); requires(Robot.driveTrain); this.angle = angle; + try { + tolerance = Robot.prefs.getDouble("angle tolerance", 2.5); + } catch (NullPointerException e) { + tolerance = 2.5; + } } // Called just before this Command runs the first time @@ -32,7 +37,6 @@ protected void initialize() { // Called repeatedly when this Command is scheduled to run protected void execute() { if (!((Robot.ahrs.getAngle() > this.angle - tolerance) && (Robot.ahrs.getAngle() < this.angle + tolerance))) { - System.out.println(this.angle); if (this.angle > 0) { Robot.driveTrain.adjustedTankDrive(-0.4, 0.4); Robot.driveTrain.resetRight(); From 34306827294d2541d2d201669bfb810cad28a430 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 09:43:10 -0500 Subject: [PATCH 02/46] Reverse on init to avoid confusion --- 3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java index 5fd6d6e..952474b 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java @@ -8,6 +8,7 @@ import com.kauailabs.navx.frc.AHRS; +import edu.wpi.first.wpilibj.DoubleSolenoid.Value; import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.PowerDistributionPanel; import edu.wpi.first.wpilibj.Preferences; @@ -58,6 +59,7 @@ public void robotInit() { turret = new Turret(); kompressor = new Kompressor(); intake = new Intake(); + intake.setPiston(Value.kReverse); oi = new OI(); ahrs = new AHRS(SerialPort.Port.kMXP); // put chooser on DS From ee4e50d4d994b530296228b41d50da5f60f96048 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 09:57:09 -0500 Subject: [PATCH 03/46] Ramp drivetrain --- .../org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index 6b6538b..e11702c 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -64,12 +64,15 @@ public class Drivetrain extends Subsystem implements IMotorizedSubsystem { */ public RobotDrive wpiDrive; private Encoder encRight; + + private static double RAMP = 0.1; public Drivetrain() { super("Drivetrain"); this.driveLeftMaster = new CANTalon(RobotMap.leftTalonOne); this.driveLeftMaster.enableBrakeMode(true); + this.driveLeftMaster.setVoltageRampRate(RAMP); this.driveLeftFollower_One = new CANTalon(RobotMap.leftTalonTwo); this.driveLeftFollower_One.enableBrakeMode(true); this.driveLeftFollower_Two = new CANTalon(RobotMap.leftTalonThree); @@ -82,6 +85,7 @@ public Drivetrain() { this.driveRightMaster = new CANTalon(RobotMap.rightTalonOne); this.driveRightMaster.enableBrakeMode(true); + this.driveRightMaster.setVoltageRampRate(RAMP); this.driveRightFollower_One = new CANTalon(RobotMap.rightTalonTwo); this.driveRightFollower_One.enableBrakeMode(true); this.driveRightFollower_Two = new CANTalon(RobotMap.rightTalonThree); From 6fc79ef4e30c6390b772775b8e7d77ee20d40662 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 10:53:28 -0500 Subject: [PATCH 04/46] Ramp work --- .../usfirst/frc/team3494/robot/subsystems/Drivetrain.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index e11702c..fc5df15 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -65,7 +65,7 @@ public class Drivetrain extends Subsystem implements IMotorizedSubsystem { public RobotDrive wpiDrive; private Encoder encRight; - private static double RAMP = 0.1; + private static double RAMP = 3/5; public Drivetrain() { super("Drivetrain"); @@ -75,8 +75,10 @@ public Drivetrain() { this.driveLeftMaster.setVoltageRampRate(RAMP); this.driveLeftFollower_One = new CANTalon(RobotMap.leftTalonTwo); this.driveLeftFollower_One.enableBrakeMode(true); + this.driveLeftFollower_One.setVoltageRampRate(RAMP); this.driveLeftFollower_Two = new CANTalon(RobotMap.leftTalonThree); this.driveLeftFollower_Two.enableBrakeMode(true); + this.driveLeftFollower_Two.setVoltageRampRate(RAMP); // master follower this.driveLeftFollower_One.changeControlMode(CANTalon.TalonControlMode.Follower); this.driveLeftFollower_One.set(driveLeftMaster.getDeviceID()); @@ -88,8 +90,10 @@ public Drivetrain() { this.driveRightMaster.setVoltageRampRate(RAMP); this.driveRightFollower_One = new CANTalon(RobotMap.rightTalonTwo); this.driveRightFollower_One.enableBrakeMode(true); + this.driveRightFollower_One.setVoltageRampRate(RAMP); this.driveRightFollower_Two = new CANTalon(RobotMap.rightTalonThree); - this.driveLeftFollower_Two.enableBrakeMode(true); + this.driveRightFollower_Two.enableBrakeMode(true); + this.driveRightFollower_Two.setVoltageRampRate(RAMP); // master follower this.driveRightFollower_One.changeControlMode(CANTalon.TalonControlMode.Follower); this.driveRightFollower_One.set(driveRightMaster.getDeviceID()); From 336459d86ce41add80b5067d146bc9a69a0f4e0b Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 10:53:37 -0500 Subject: [PATCH 05/46] Enable USB camera --- 3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java index 952474b..bad7903 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java @@ -8,6 +8,8 @@ import com.kauailabs.navx.frc.AHRS; +import edu.wpi.cscore.UsbCamera; +import edu.wpi.first.wpilibj.CameraServer; import edu.wpi.first.wpilibj.DoubleSolenoid.Value; import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.PowerDistributionPanel; @@ -62,6 +64,7 @@ public void robotInit() { intake.setPiston(Value.kReverse); oi = new OI(); ahrs = new AHRS(SerialPort.Port.kMXP); + UsbCamera camera = CameraServer.getInstance().startAutomaticCapture(); // put chooser on DS // SmartDashboard.putData("Auto mode", chooser); // get preferences From e13aabfc3e45b45bcb56e5508dafa4fc54931efc Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 11:24:48 -0500 Subject: [PATCH 06/46] Back to pushbuttons on intake --- .../frc/team3494/robot/commands/intake/RunIntake.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.java index 7946224..78ebc8e 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.java @@ -25,14 +25,9 @@ protected void initialize() { // Called repeatedly when this Command is scheduled to run protected void execute() { if (Robot.oi.xbox_lt.get()) { - this.speed = 1; - this.running = !this.running; + Robot.intake.runIntake(0.75); } else if (Robot.oi.xbox_rt.get()) { - this.speed = -1; - this.running = !this.running; - } - if (running) { - Robot.intake.runIntake(this.speed); + Robot.intake.runIntake(-0.75); } else { Robot.intake.stopAll(); } From bd7607822c750e49d158f4482cb8674cfbdbe2dc Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 11:25:02 -0500 Subject: [PATCH 07/46] Supress unused warning --- 3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java | 1 + 1 file changed, 1 insertion(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java index bad7903..33a753e 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java @@ -64,6 +64,7 @@ public void robotInit() { intake.setPiston(Value.kReverse); oi = new OI(); ahrs = new AHRS(SerialPort.Port.kMXP); + @SuppressWarnings("unused") UsbCamera camera = CameraServer.getInstance().startAutomaticCapture(); // put chooser on DS // SmartDashboard.putData("Auto mode", chooser); From 3bfeb24c668dfe76fc2d20b850a7207f4b3ff9c2 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 12:56:53 -0500 Subject: [PATCH 08/46] Change ramp value --- .../org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index fc5df15..a6fa43c 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -65,7 +65,7 @@ public class Drivetrain extends Subsystem implements IMotorizedSubsystem { public RobotDrive wpiDrive; private Encoder encRight; - private static double RAMP = 3/5; + private static double RAMP = 0.6; public Drivetrain() { super("Drivetrain"); From 6a244b539794dd2347e7d7cc769bc05996c4ccf5 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 13:02:37 -0500 Subject: [PATCH 09/46] Format source --- .../org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index a6fa43c..30c45c2 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -64,7 +64,7 @@ public class Drivetrain extends Subsystem implements IMotorizedSubsystem { */ public RobotDrive wpiDrive; private Encoder encRight; - + private static double RAMP = 0.6; public Drivetrain() { From 95796528250079ed0c27d727626a09979994cbb6 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 13:17:12 -0500 Subject: [PATCH 10/46] Add a missing method --- .../org/usfirst/frc/team3494/robot/subsystems/Turret.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java index 64b87dc..f1b77cd 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java @@ -66,7 +66,7 @@ public double getDistance(TurretEncoders enc) { } /** - * Turns the turret at a hardcoded speed in the specified direction. + * Turns the turret at a hard-coded speed in the specified direction. * * @param dir * The direction to turn in. Defaults to right if you put in @@ -79,4 +79,9 @@ public void turnTurret(DriveDirections dir) { this.turretRing.set(-turretTurnPower); } } + + public void shoot(double power) { + this.shooterUpper.set(power); + this.shooterLower.set(power); + } } From 474720ef4b1d63290f0ef2f53bc82b1a29d6dbda Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:03:52 -0500 Subject: [PATCH 11/46] Debug dashboard --- 3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java index 33a753e..00b6c8b 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/Robot.java @@ -139,6 +139,8 @@ public void teleopInit() { public void teleopPeriodic() { Scheduler.getInstance().run(); SmartDashboard.putNumber("Gyro Z", ahrs.getAngle()); + SmartDashboard.putNumber("distance", Robot.driveTrain.getLeftDistance(UnitTypes.RAWCOUNT)); + SmartDashboard.putNumber("distance inches", Robot.driveTrain.getLeftDistance(UnitTypes.INCHES)); SmartDashboard.putNumber("Motor 0", Robot.pdp.getCurrent(0)); SmartDashboard.putNumber("Motor 1", Robot.pdp.getCurrent(1)); From ad13d2677c831d91eace8383c34631cf9787260d Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:04:13 -0500 Subject: [PATCH 12/46] Left encoder --- 3494_2017_repo/src/org/usfirst/frc/team3494/robot/RobotMap.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/RobotMap.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/RobotMap.java index b2e1d2f..42e1e62 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/RobotMap.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/RobotMap.java @@ -31,6 +31,8 @@ public class RobotMap { // encoders public static final int ENCODER_RIGHT_A = 0; public static final int ENCODER_RIGHT_B = 1; + public static final int ENCODER_LEFT_A = 2; + public static final int ENCODER_LEFT_B = 3; // intake public static final int INTAKE_MOTOR = 0; public static final int UP_MOTOR = 2; From cd6af7de75fbce78f1e4f47d34e487ce2de9dfb9 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:04:20 -0500 Subject: [PATCH 13/46] Add a unit --- .../src/org/usfirst/frc/team3494/robot/UnitTypes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/UnitTypes.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/UnitTypes.java index a513c70..197a5f0 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/UnitTypes.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/UnitTypes.java @@ -6,5 +6,5 @@ * @since 0.0.0 */ public enum UnitTypes { - INCHES, MILLIMETERS, FEET, RAWCOUNT; + INCHES, MILLIMETERS, FEET, RAWCOUNT, ROTATIONS; } From de3c65fd82a007c69b6c066b3528e1a9d29c5080 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:04:41 -0500 Subject: [PATCH 14/46] Tweak distance drive --- .../team3494/robot/commands/auto/DistanceDrive.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java index f862b8e..2513a3b 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java @@ -34,9 +34,13 @@ protected void initialize() { // Called repeatedly when this Command is scheduled to run @Override protected void execute() { - System.out.println("Driving forward: " + this.dist); - Robot.driveTrain.adjustedTankDrive(0.3, 0.3); - System.out.println("Right distance: " + Robot.driveTrain.getRightDistance(this.unit)); + if (this.dist > Robot.driveTrain.getRightDistance(this.unit)) { + System.out.println("Driving forward: " + this.dist); + Robot.driveTrain.adjustedTankDrive(0.3, 0.3); + System.out.println("Right distance: " + Robot.driveTrain.getRightDistance(this.unit)); + } else { + return; + } } // Make this return true when this Command no longer needs to run execute() From 90b456efb826ae6765ce299d0e25b8998815eabd Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:04:53 -0500 Subject: [PATCH 15/46] Add left encoder, fix bad math --- .../team3494/robot/subsystems/Drivetrain.java | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index 30c45c2..96ee620 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -64,6 +64,7 @@ public class Drivetrain extends Subsystem implements IMotorizedSubsystem { */ public RobotDrive wpiDrive; private Encoder encRight; + private Encoder encLeft; private static double RAMP = 0.6; @@ -102,10 +103,13 @@ public Drivetrain() { this.wpiDrive = new RobotDrive(driveLeftMaster, driveRightMaster); - this.encRight = new Encoder(RobotMap.ENCODER_RIGHT_A, RobotMap.ENCODER_RIGHT_B, false, - Encoder.EncodingType.k4X); - this.encRight.setDistancePerPulse(1 / 1440); + this.encRight = new Encoder(RobotMap.ENCODER_RIGHT_A, RobotMap.ENCODER_RIGHT_B); + this.encRight.setDistancePerPulse(1 / 360); this.encRight.reset(); + + this.encLeft = new Encoder(RobotMap.ENCODER_LEFT_A, RobotMap.ENCODER_LEFT_B, true); + this.encLeft.setDistancePerPulse(1 / 360); + this.encLeft.reset(); } // Put methods for controlling this subsystem // here. Call these from Commands. @@ -158,21 +162,27 @@ public void adjustedTankDrive(double left, double right) { * unit. */ public double getRightDistance(UnitTypes unit) { - double inches; - try { - inches = ((Math.PI * 4) * (this.encRight.get() / 1440) * 360); - } catch (ArithmeticException e) { - inches = 0; - } + double inches = (Math.PI * 4) * (this.encRight.get() / 360); if (unit.equals(UnitTypes.INCHES)) { return inches; } else if (unit.equals(UnitTypes.FEET)) { - return inches / 12; + return inches / 12.0D; } else { return this.encRight.get(); } } - + + public double getLeftDistance(UnitTypes unit) { + double inches = (Math.PI * 4) * (this.encLeft.get() / 360.0D); + if (unit.equals(UnitTypes.INCHES)) { + return inches; + } else if (unit.equals(UnitTypes.FEET)) { + return inches / 12.0D; + } else { + return this.encLeft.get(); + } + } + /** * Resets the encoder on the right side of the drivetrain. */ From b9bcc74b4a29650b7fdb69c587edf3999ca6964b Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:05:42 -0500 Subject: [PATCH 16/46] Remove command version of X Y drive --- .../commands/auto/CartesianTurnDrive.java | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/CartesianTurnDrive.java diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/CartesianTurnDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/CartesianTurnDrive.java deleted file mode 100644 index ab9a04a..0000000 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/CartesianTurnDrive.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.usfirst.frc.team3494.robot.commands.auto; - -import org.usfirst.frc.team3494.robot.Robot; -import org.usfirst.frc.team3494.robot.UnitTypes; - -import edu.wpi.first.wpilibj.command.Command; -import edu.wpi.first.wpilibj.command.Scheduler; - -/** - * WIP coordinate drive system. - * - * @see org.usfirst.frc.team3494.robot.commands.auto.AngleTurn - * @see org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive - * @since 0.0.2 - */ -public class CartesianTurnDrive extends Command { - - private double rise; - private double run; - private double hypot; - private double angle; - private boolean isDone = false; - - public CartesianTurnDrive(double rise, double run) { - // Use requires() here to declare subsystem dependencies - // eg. requires(chassis); - requires(Robot.driveTrain); - this.rise = rise; - this.run = run; - // angle = inverse tan(rise/run) - this.angle = Math.toDegrees(Math.atan2(rise, run)); - } - - // Called just before this Command runs the first time - protected void initialize() { - Robot.ahrs.reset(); - Robot.driveTrain.resetRight(); - double run2 = this.run * this.run; - double rise2 = this.rise * this.rise; - this.hypot = Math.sqrt(run2 + rise2); - } - - // Called repeatedly when this Command is scheduled to run - protected void execute() { - Scheduler.getInstance().add(new AngleTurn(this.angle)); - Robot.driveTrain.resetRight(); - if (Robot.driveTrain.getRightDistance(UnitTypes.INCHES) > this.hypot) { - Robot.driveTrain.adjustedTankDrive(0.3, 0.3); - } else { - this.isDone = true; - } - } - - // Make this return true when this Command no longer needs to run execute() - protected boolean isFinished() { - return this.isDone; - } - - // Called once after isFinished returns true - protected void end() { - this.isDone = false; - } - - // Called when another command which requires one or more of the same - // subsystems is scheduled to run - protected void interrupted() { - } -} From 501b23225839cf3fd3f9f14c37b853ae7b94db9c Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:05:57 -0500 Subject: [PATCH 17/46] Eureka! Command groups! --- .../org/usfirst/frc/team3494/robot/OI.java | 4 +- .../team3494/robot/commands/auto/XYDrive.java | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/OI.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/OI.java index 059692b..a5ac492 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/OI.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/OI.java @@ -1,7 +1,7 @@ package org.usfirst.frc.team3494.robot; import org.usfirst.frc.team3494.robot.commands.auto.AngleTurn; -import org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive; +import org.usfirst.frc.team3494.robot.commands.auto.XYDrive; import org.usfirst.frc.team3494.robot.commands.intake.SwitchPosition; import edu.wpi.first.wpilibj.Joystick; @@ -52,6 +52,6 @@ public class OI { public OI() { xbox_b.whenPressed(new SwitchPosition()); xbox_y.whenPressed(new AngleTurn(90)); - xbox_x.whenPressed(new DistanceDrive(2, UnitTypes.FEET)); + xbox_x.whenPressed(new XYDrive(12, 24)); } } diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java new file mode 100644 index 0000000..f5391c1 --- /dev/null +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java @@ -0,0 +1,41 @@ +package org.usfirst.frc.team3494.robot.commands.auto; + +import org.usfirst.frc.team3494.robot.Robot; +import org.usfirst.frc.team3494.robot.UnitTypes; + +import edu.wpi.first.wpilibj.command.CommandGroup; + +/** + * + */ +public class XYDrive extends CommandGroup { + + private double hypot; + private double angle; + + public XYDrive(double rise, double run) { + double run2 = run * run; + double rise2 = rise * rise; + this.hypot = Math.sqrt(run2 + rise2); + this.angle = Math.toDegrees(Math.atan2(rise, run)); + requires(Robot.driveTrain); + // Add Commands here: + // e.g. addSequential(new Command1()); + // addSequential(new Command2()); + // these will run in order. + addSequential(new AngleTurn(angle)); + addSequential(new DistanceDrive(hypot, UnitTypes.INCHES)); + + // To run multiple commands at the same time, + // use addParallel() + // e.g. addParallel(new Command1()); + // addSequential(new Command2()); + // Command1 and Command2 will run in parallel. + + // A command group will require all of the subsystems that each member + // would require. + // e.g. if Command1 requires chassis, and Command2 requires arm, + // a CommandGroup containing them would require both the chassis and the + // arm. + } +} From 3ba893ba8901b32a8ada58b0bb817d5c93779c53 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:10:14 -0500 Subject: [PATCH 18/46] Generate JavaDoc --- docs/allclasses-frame.html | 4 +- docs/allclasses-noframe.html | 4 +- docs/constant-values.html | 16 +- docs/deprecated-list.html | 2 +- docs/help-doc.html | 2 +- docs/index-files/index-1.html | 4 +- docs/index-files/index-10.html | 2 +- docs/index-files/index-11.html | 2 +- docs/index-files/index-12.html | 2 +- docs/index-files/index-13.html | 8 +- docs/index-files/index-14.html | 4 +- docs/index-files/index-15.html | 4 +- docs/index-files/index-16.html | 2 +- docs/index-files/index-17.html | 2 +- docs/index-files/index-18.html | 2 +- docs/index-files/index-19.html | 6 +- docs/index-files/index-2.html | 8 +- docs/index-files/index-3.html | 2 +- docs/index-files/index-4.html | 12 +- docs/index-files/index-5.html | 4 +- docs/index-files/index-6.html | 4 +- docs/index-files/index-7.html | 10 +- docs/index-files/index-8.html | 2 +- docs/index-files/index-9.html | 2 +- docs/index.html | 2 +- .../frc/team3494/robot/DriveDirections.html | 2 +- docs/org/usfirst/frc/team3494/robot/OI.html | 2 +- .../org/usfirst/frc/team3494/robot/Robot.html | 2 +- .../usfirst/frc/team3494/robot/RobotMap.html | 36 +- .../usfirst/frc/team3494/robot/UnitTypes.html | 16 +- .../robot/class-use/DriveDirections.html | 4 +- .../frc/team3494/robot/class-use/OI.html | 2 +- .../frc/team3494/robot/class-use/Robot.html | 2 +- .../team3494/robot/class-use/RobotMap.html | 2 +- .../team3494/robot/class-use/UnitTypes.html | 6 +- .../robot/commands/auto/AngleTurn.html | 6 +- .../robot/commands/auto/DistanceDrive.html | 10 +- .../team3494/robot/commands/auto/XYDrive.html | 316 ++++++++++++++++++ .../commands/auto/class-use/AngleTurn.html | 2 +- .../auto/class-use/DistanceDrive.html | 2 +- .../commands/auto/class-use/XYDrive.html | 124 +++++++ .../robot/commands/auto/package-frame.html | 4 +- .../robot/commands/auto/package-summary.html | 12 +- .../robot/commands/auto/package-tree.html | 8 +- .../robot/commands/auto/package-use.html | 2 +- .../team3494/robot/commands/climb/Climb.html | 2 +- .../robot/commands/climb/StopClimber.html | 2 +- .../robot/commands/climb/class-use/Climb.html | 2 +- .../commands/climb/class-use/StopClimber.html | 2 +- .../robot/commands/climb/package-frame.html | 2 +- .../robot/commands/climb/package-summary.html | 2 +- .../robot/commands/climb/package-tree.html | 2 +- .../robot/commands/climb/package-use.html | 2 +- .../team3494/robot/commands/drive/Drive.html | 2 +- .../robot/commands/drive/class-use/Drive.html | 2 +- .../robot/commands/drive/package-frame.html | 2 +- .../robot/commands/drive/package-summary.html | 2 +- .../robot/commands/drive/package-tree.html | 2 +- .../robot/commands/drive/package-use.html | 2 +- .../robot/commands/intake/RunIntake.html | 2 +- .../robot/commands/intake/SwitchPosition.html | 2 +- .../commands/intake/class-use/RunIntake.html | 2 +- .../intake/class-use/SwitchPosition.html | 2 +- .../robot/commands/intake/package-frame.html | 2 +- .../commands/intake/package-summary.html | 2 +- .../robot/commands/intake/package-tree.html | 2 +- .../robot/commands/intake/package-use.html | 2 +- .../robot/commands/package-frame.html | 2 +- .../robot/commands/package-summary.html | 2 +- .../team3494/robot/commands/package-tree.html | 2 +- .../team3494/robot/commands/package-use.html | 2 +- .../frc/team3494/robot/package-frame.html | 2 +- .../frc/team3494/robot/package-summary.html | 2 +- .../frc/team3494/robot/package-tree.html | 2 +- .../frc/team3494/robot/package-use.html | 2 +- .../team3494/robot/subsystems/Climber.html | 2 +- .../team3494/robot/subsystems/Drivetrain.html | 55 ++- .../robot/subsystems/IMotorizedSubsystem.html | 2 +- .../frc/team3494/robot/subsystems/Intake.html | 2 +- .../team3494/robot/subsystems/Kompressor.html | 2 +- .../frc/team3494/robot/subsystems/Turret.html | 25 +- .../robot/subsystems/TurretEncoders.html | 2 +- .../robot/subsystems/class-use/Climber.html | 2 +- .../subsystems/class-use/Drivetrain.html | 2 +- .../class-use/IMotorizedSubsystem.html | 2 +- .../robot/subsystems/class-use/Intake.html | 2 +- .../subsystems/class-use/Kompressor.html | 2 +- .../robot/subsystems/class-use/Turret.html | 2 +- .../subsystems/class-use/TurretEncoders.html | 2 +- .../robot/subsystems/package-frame.html | 2 +- .../robot/subsystems/package-summary.html | 2 +- .../robot/subsystems/package-tree.html | 2 +- .../robot/subsystems/package-use.html | 2 +- docs/overview-frame.html | 2 +- docs/overview-summary.html | 2 +- docs/overview-tree.html | 8 +- 96 files changed, 706 insertions(+), 150 deletions(-) create mode 100644 docs/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.html create mode 100644 docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/XYDrive.html diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index f756ed0..a9143ce 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,7 +2,7 @@ - + All Classes @@ -13,7 +13,6 @@

All Classes

diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index b5d3905..a7bc0f4 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,7 +2,7 @@ - + All Classes @@ -13,7 +13,6 @@

All Classes

diff --git a/docs/constant-values.html b/docs/constant-values.html index 1d2040c..ba5e697 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,7 +2,7 @@ - + Constant Field Values @@ -112,6 +112,20 @@

org.usfirst.*

0.1 + + +public static final int +ENCODER_LEFT_A +2 + + + + +public static final int +ENCODER_LEFT_B +3 + + public static final int diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index 88ef363..c42cd21 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,7 +2,7 @@ - + Deprecated List diff --git a/docs/help-doc.html b/docs/help-doc.html index 9715263..7179d72 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -2,7 +2,7 @@ - + API Help diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index 74784b5..6079d6f 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -2,7 +2,7 @@ - + A-Index @@ -84,7 +84,7 @@

A

angle - Variable in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
angle - Variable in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
+
angle - Variable in class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
 
AngleTurn - Class in org.usfirst.frc.team3494.robot.commands.auto
diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index 98017e7..fa503f7 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,7 +2,7 @@ - + M-Index diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index 535b0cf..27249de 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -2,7 +2,7 @@ - + O-Index diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index 88c9dc5..e58a310 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -2,7 +2,7 @@ - + P-Index diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index d3f4f62..90ce14c 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -2,7 +2,7 @@ - + R-Index @@ -74,6 +74,8 @@

R

+
RAMP - Static variable in class org.usfirst.frc.team3494.robot.subsystems.Drivetrain
+
 
resetRight() - Method in class org.usfirst.frc.team3494.robot.subsystems.Drivetrain
Resets the encoder on the right side of the drivetrain.
@@ -88,8 +90,6 @@

R

 
rightTalonTwo - Static variable in class org.usfirst.frc.team3494.robot.RobotMap
 
-
rise - Variable in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
Robot - Class in org.usfirst.frc.team3494.robot
The VM is configured to automatically run this class, and to call the @@ -110,8 +110,6 @@

R

RobotMap() - Constructor for class org.usfirst.frc.team3494.robot.RobotMap
 
-
run - Variable in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
RunIntake - Class in org.usfirst.frc.team3494.robot.commands.intake
Runs the intake.
diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index 1150d6c..dcc4c61 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -2,7 +2,7 @@ - + S-Index @@ -88,6 +88,8 @@

S

 
setPiston(DoubleSolenoid.Value) - Method in class org.usfirst.frc.team3494.robot.subsystems.Intake
 
+
shoot(double) - Method in class org.usfirst.frc.team3494.robot.subsystems.Turret
+
 
shooterEnc_lower - Variable in class org.usfirst.frc.team3494.robot.subsystems.Turret
 
shooterEnc_upper - Variable in class org.usfirst.frc.team3494.robot.subsystems.Turret
diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index cd41ada..e8ea495 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -2,7 +2,7 @@ - + T-Index @@ -92,7 +92,7 @@

T

 
turnTurret(DriveDirections) - Method in class org.usfirst.frc.team3494.robot.subsystems.Turret
-
Turns the turret at a hardcoded speed in the specified direction.
+
Turns the turret at a hard-coded speed in the specified direction.
turret - Static variable in class org.usfirst.frc.team3494.robot.Robot
 
diff --git a/docs/index-files/index-16.html b/docs/index-files/index-16.html index 03c2475..2aa1251 100644 --- a/docs/index-files/index-16.html +++ b/docs/index-files/index-16.html @@ -2,7 +2,7 @@ - + U-Index diff --git a/docs/index-files/index-17.html b/docs/index-files/index-17.html index 218a7f5..d2aec24 100644 --- a/docs/index-files/index-17.html +++ b/docs/index-files/index-17.html @@ -2,7 +2,7 @@ - + V-Index diff --git a/docs/index-files/index-18.html b/docs/index-files/index-18.html index a323b6d..0e83668 100644 --- a/docs/index-files/index-18.html +++ b/docs/index-files/index-18.html @@ -2,7 +2,7 @@ - + W-Index diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html index 46d2a65..dcbc9b0 100644 --- a/docs/index-files/index-19.html +++ b/docs/index-files/index-19.html @@ -2,7 +2,7 @@ - + X-Index @@ -88,6 +88,10 @@

X

 
xbox_y - Variable in class org.usfirst.frc.team3494.robot.OI
 
+
XYDrive - Class in org.usfirst.frc.team3494.robot.commands.auto
+
 
+
XYDrive(double, double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
+
 
A C D E G H I K L M O P R S T U V W X  diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index 8ae2386..df5a6c0 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -2,7 +2,7 @@ - + C-Index @@ -74,12 +74,6 @@

C

-
CartesianTurnDrive - Class in org.usfirst.frc.team3494.robot.commands.auto
-
-
WIP coordinate drive system.
-
-
CartesianTurnDrive(double, double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
chooser - Variable in class org.usfirst.frc.team3494.robot.Robot
 
Climb - Class in org.usfirst.frc.team3494.robot.commands.climb
diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index 1bc0b04..a2d339c 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,7 +2,7 @@ - + D-Index diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index 2b3ec01..e09385c 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -2,7 +2,7 @@ - + E-Index @@ -74,6 +74,12 @@

E

+
encLeft - Variable in class org.usfirst.frc.team3494.robot.subsystems.Drivetrain
+
 
+
ENCODER_LEFT_A - Static variable in class org.usfirst.frc.team3494.robot.RobotMap
+
 
+
ENCODER_LEFT_B - Static variable in class org.usfirst.frc.team3494.robot.RobotMap
+
 
ENCODER_RIGHT_A - Static variable in class org.usfirst.frc.team3494.robot.RobotMap
 
ENCODER_RIGHT_B - Static variable in class org.usfirst.frc.team3494.robot.RobotMap
@@ -82,8 +88,6 @@

E

 
end() - Method in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
end() - Method in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
end() - Method in class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
 
end() - Method in class org.usfirst.frc.team3494.robot.commands.climb.Climb
@@ -98,8 +102,6 @@

E

 
execute() - Method in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
execute() - Method in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
execute() - Method in class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
 
execute() - Method in class org.usfirst.frc.team3494.robot.commands.climb.Climb
diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 396f74a..6267ba3 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,7 +2,7 @@ - + G-Index @@ -76,6 +76,8 @@

G

getDistance(TurretEncoders) - Method in class org.usfirst.frc.team3494.robot.subsystems.Turret
 
+
getLeftDistance(UnitTypes) - Method in class org.usfirst.frc.team3494.robot.subsystems.Drivetrain
+
 
getRightDistance(UnitTypes) - Method in class org.usfirst.frc.team3494.robot.subsystems.Drivetrain
Gets the distance the right encoder has counted in the specified unit.
diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index 4c8591a..bd81140 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -2,7 +2,7 @@ - + H-Index @@ -74,7 +74,7 @@

H

-
hypot - Variable in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
+
hypot - Variable in class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
 
A C D E G H I K L M O P R S T U V W X  diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index 30effda..b383f83 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -2,7 +2,7 @@ - + I-Index @@ -90,8 +90,6 @@

I

 
initialize() - Method in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
initialize() - Method in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
initialize() - Method in class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
 
initialize() - Method in class org.usfirst.frc.team3494.robot.commands.climb.Climb
@@ -124,8 +122,6 @@

I

 
interrupted() - Method in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
interrupted() - Method in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
interrupted() - Method in class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
 
interrupted() - Method in class org.usfirst.frc.team3494.robot.commands.climb.Climb
@@ -140,12 +136,8 @@

I

 
isDeployed - Variable in class org.usfirst.frc.team3494.robot.subsystems.Intake
 
-
isDone - Variable in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
isFinished() - Method in class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
 
-
isFinished() - Method in class org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
-
 
isFinished() - Method in class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
 
isFinished() - Method in class org.usfirst.frc.team3494.robot.commands.climb.Climb
diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index d4b1b7a..959cebb 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -2,7 +2,7 @@ - + K-Index diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index 4e38260..f6232c2 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -2,7 +2,7 @@ - + L-Index diff --git a/docs/index.html b/docs/index.html index a607900..781452b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) + + + + + + + + + +
+
org.usfirst.frc.team3494.robot.commands.auto
+

Class XYDrive

+
+
+
    +
  • java.lang.Object
  • +
  • +
      +
    • edu.wpi.first.wpilibj.command.Command
    • +
    • +
        +
      • edu.wpi.first.wpilibj.command.CommandGroup
      • +
      • +
          +
        • org.usfirst.frc.team3494.robot.commands.auto.XYDrive
        • +
        +
      • +
      +
    • +
    +
  • +
+
+
    +
  • +
    +
    All Implemented Interfaces:
    +
    edu.wpi.first.wpilibj.NamedSendable, edu.wpi.first.wpilibj.Sendable
    +
    +
    +
    +
    public class XYDrive
    +extends edu.wpi.first.wpilibj.command.CommandGroup
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Summary

      + + + + + + + + + + + + + + +
      Fields 
      Modifier and TypeField and Description
      private doubleangle 
      private doublehypot 
      +
    • +
    + +
      +
    • + + +

      Constructor Summary

      + + + + + + + + +
      Constructors 
      Constructor and Description
      XYDrive(double rise, + double run) 
      +
    • +
    + +
      +
    • + + +

      Method Summary

      +
        +
      • + + +

        Methods inherited from class edu.wpi.first.wpilibj.command.CommandGroup

        +addParallel, addParallel, addSequential, addSequential, end, execute, initialize, interrupted, isFinished, isInterruptible
      • +
      +
        +
      • + + +

        Methods inherited from class edu.wpi.first.wpilibj.command.Command

        +cancel, clearRequirements, doesRequire, getGroup, getName, getSmartDashboardType, getTable, initTable, isCanceled, isRunning, isTimedOut, requires, setInterruptible, setRunWhenDisabled, setTimeout, start, timeSinceInitialized, toString, willRunWhenDisabled
      • +
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
      • +
      +
    • +
    +
  • +
+
+
+
    +
  • + +
      +
    • + + +

      Field Detail

      + + + +
        +
      • +

        hypot

        +
        private double hypot
        +
      • +
      + + + +
        +
      • +

        angle

        +
        private double angle
        +
      • +
      +
    • +
    + +
      +
    • + + +

      Constructor Detail

      + + + +
        +
      • +

        XYDrive

        +
        public XYDrive(double rise,
        +               double run)
        +
      • +
      +
    • +
    +
  • +
+
+
+ + + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/AngleTurn.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/AngleTurn.html index 4eb3b09..efb3cc1 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/AngleTurn.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/AngleTurn.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/DistanceDrive.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/DistanceDrive.html index 96f72b2..01cc721 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/DistanceDrive.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/DistanceDrive.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/XYDrive.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/XYDrive.html new file mode 100644 index 0000000..d871e45 --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/class-use/XYDrive.html @@ -0,0 +1,124 @@ + + + + + +Uses of Class org.usfirst.frc.team3494.robot.commands.auto.XYDrive + + + + + + + + + + + +
+

Uses of Class
org.usfirst.frc.team3494.robot.commands.auto.XYDrive

+
+
No usage of org.usfirst.frc.team3494.robot.commands.auto.XYDrive
+ + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-frame.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-frame.html index f679ab5..68db0b5 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.auto @@ -14,8 +14,8 @@

Classes

diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-summary.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-summary.html index b051b88..7a86437 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.auto @@ -89,17 +89,15 @@

Package org.usfirst.frc.team3494.robot.co -CartesianTurnDrive - -
WIP coordinate drive system.
- - - DistanceDrive
Drives a given distance.
+ +XYDrive +  + diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-tree.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-tree.html index a2a05ec..8d5020c 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.auto Class Hierarchy @@ -84,7 +84,11 @@

Class Hierarchy

  • edu.wpi.first.wpilibj.command.Command (implements edu.wpi.first.wpilibj.NamedSendable)
    • org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
    • -
    • org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
    • +
    • edu.wpi.first.wpilibj.command.CommandGroup +
        +
      • org.usfirst.frc.team3494.robot.commands.auto.XYDrive
      • +
      +
    • org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
  • diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-use.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-use.html index fcd5f92..ee401af 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.commands.auto diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/Climb.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/Climb.html index 5801645..7214b59 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/Climb.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/Climb.html @@ -2,7 +2,7 @@ - + Climb diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/StopClimber.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/StopClimber.html index 5cd2b09..d06265d 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/StopClimber.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/StopClimber.html @@ -2,7 +2,7 @@ - + StopClimber diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/Climb.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/Climb.html index b07a2d4..ed19233 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/Climb.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/Climb.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.climb.Climb diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/StopClimber.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/StopClimber.html index 2b0d49c..18ba9d6 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/StopClimber.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/class-use/StopClimber.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.climb.StopClimber diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-frame.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-frame.html index e8b1590..47661bb 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.climb diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-summary.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-summary.html index d8fe918..604b22b 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.climb diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-tree.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-tree.html index 1be4796..1acb633 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.climb Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-use.html b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-use.html index f0f7a8a..23c17cb 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/climb/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/climb/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.commands.climb diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html index a756c1a..84725ff 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html @@ -2,7 +2,7 @@ - + Drive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/class-use/Drive.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/class-use/Drive.html index aaa0e4f..8621a51 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/class-use/Drive.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/class-use/Drive.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.drive.Drive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-frame.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-frame.html index 209af69..7a71bd2 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.drive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-summary.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-summary.html index 8ecb516..18af6e4 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.drive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-tree.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-tree.html index 873db61..c6e3430 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.drive Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-use.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-use.html index 8c3b6f9..4e00222 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.commands.drive diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.html index 9833bfd..ea9c3a8 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/RunIntake.html @@ -2,7 +2,7 @@ - + RunIntake diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/SwitchPosition.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/SwitchPosition.html index 9879bec..3cf80de 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/SwitchPosition.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/SwitchPosition.html @@ -2,7 +2,7 @@ - + SwitchPosition diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/RunIntake.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/RunIntake.html index 31be1fb..317b6af 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/RunIntake.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/RunIntake.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.intake.RunIntake diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/SwitchPosition.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/SwitchPosition.html index ae3d319..1c73f7b 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/SwitchPosition.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/class-use/SwitchPosition.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.commands.intake.SwitchPosition diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-frame.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-frame.html index d566f35..3e86104 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.intake diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-summary.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-summary.html index 363ca5f..b3ddbe7 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.intake diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-tree.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-tree.html index 12f9023..1be2a12 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands.intake Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-use.html b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-use.html index 3ea31ac..edb93cb 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/intake/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/intake/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.commands.intake diff --git a/docs/org/usfirst/frc/team3494/robot/commands/package-frame.html b/docs/org/usfirst/frc/team3494/robot/commands/package-frame.html index ffb1898..96ff32d 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands diff --git a/docs/org/usfirst/frc/team3494/robot/commands/package-summary.html b/docs/org/usfirst/frc/team3494/robot/commands/package-summary.html index 43e1f8d..2fcb52f 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands diff --git a/docs/org/usfirst/frc/team3494/robot/commands/package-tree.html b/docs/org/usfirst/frc/team3494/robot/commands/package-tree.html index fce4a98..2ef56e5 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.commands Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/commands/package-use.html b/docs/org/usfirst/frc/team3494/robot/commands/package-use.html index fd155f1..96efa72 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.commands diff --git a/docs/org/usfirst/frc/team3494/robot/package-frame.html b/docs/org/usfirst/frc/team3494/robot/package-frame.html index 5ddf8d4..0bcf493 100644 --- a/docs/org/usfirst/frc/team3494/robot/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot diff --git a/docs/org/usfirst/frc/team3494/robot/package-summary.html b/docs/org/usfirst/frc/team3494/robot/package-summary.html index 49d194d..f781276 100644 --- a/docs/org/usfirst/frc/team3494/robot/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot diff --git a/docs/org/usfirst/frc/team3494/robot/package-tree.html b/docs/org/usfirst/frc/team3494/robot/package-tree.html index f882ba4..324f843 100644 --- a/docs/org/usfirst/frc/team3494/robot/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/package-use.html b/docs/org/usfirst/frc/team3494/robot/package-use.html index 1e11ae1..ea30700 100644 --- a/docs/org/usfirst/frc/team3494/robot/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/Climber.html b/docs/org/usfirst/frc/team3494/robot/subsystems/Climber.html index 0fc1fd0..83bddd8 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/Climber.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/Climber.html @@ -2,7 +2,7 @@ - + Climber diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.html b/docs/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.html index da4ede7..8c4e103 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.html @@ -2,7 +2,7 @@ - + Drivetrain @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -184,8 +184,16 @@

    Field Summary

    private edu.wpi.first.wpilibj.Encoder +encLeft  + + +private edu.wpi.first.wpilibj.Encoder encRight  + +private static double +RAMP  + edu.wpi.first.wpilibj.RobotDrive wpiDrive @@ -233,33 +241,37 @@

    Method Summary

    double +getLeftDistance(UnitTypes unit)  + + +double getRightDistance(UnitTypes unit)
    Gets the distance the right encoder has counted in the specified unit.
    - + void initDefaultCommand()  - + void resetRight()
    Resets the encoder on the right side of the drivetrain.
    - + void setAll(double speed)
    Sets all motors on a subsystem to a given speed.
    - + void stopAll()
    Stop all motors on the subsystem.
    - + void TankDrive(double left, double right) @@ -399,12 +411,30 @@

    wpiDrive

    -
      +
      • encRight

        private edu.wpi.first.wpilibj.Encoder encRight
      + + + +
        +
      • +

        encLeft

        +
        private edu.wpi.first.wpilibj.Encoder encLeft
        +
      • +
      + + + +
        +
      • +

        RAMP

        +
        private static double RAMP
        +
      • +
    @@ -499,6 +529,15 @@

    getRightDistance

    + + + +
      +
    • +

      getLeftDistance

      +
      public double getLeftDistance(UnitTypes unit)
      +
    • +
    diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/IMotorizedSubsystem.html b/docs/org/usfirst/frc/team3494/robot/subsystems/IMotorizedSubsystem.html index af2561c..724d5a9 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/IMotorizedSubsystem.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/IMotorizedSubsystem.html @@ -2,7 +2,7 @@ - + IMotorizedSubsystem diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/Intake.html b/docs/org/usfirst/frc/team3494/robot/subsystems/Intake.html index 7d1b616..0a76016 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/Intake.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/Intake.html @@ -2,7 +2,7 @@ - + Intake diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/Kompressor.html b/docs/org/usfirst/frc/team3494/robot/subsystems/Kompressor.html index b36c409..d683e54 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/Kompressor.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/Kompressor.html @@ -2,7 +2,7 @@ - + Kompressor diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/Turret.html b/docs/org/usfirst/frc/team3494/robot/subsystems/Turret.html index 89479e1..827a9d2 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/Turret.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/Turret.html @@ -2,7 +2,7 @@ - + Turret @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -222,14 +222,18 @@

    Method Summary

    void +shoot(double power)  + + +void stopAll()
    Stop all motors on the subsystem.
    - + void turnTurret(DriveDirections dir) -
    Turns the turret at a hardcoded speed in the specified direction.
    +
    Turns the turret at a hard-coded speed in the specified direction.
    @@ -408,11 +412,11 @@

    getDistance

    -
      +
      • turnTurret

        public void turnTurret(DriveDirections dir)
        -
        Turns the turret at a hardcoded speed in the specified direction.
        +
        Turns the turret at a hard-coded speed in the specified direction.
        Parameters:
        dir - The direction to turn in. Defaults to right if you put in @@ -420,6 +424,15 @@

        turnTurret

      + + + +
        +
      • +

        shoot

        +
        public void shoot(double power)
        +
      • +
    diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/TurretEncoders.html b/docs/org/usfirst/frc/team3494/robot/subsystems/TurretEncoders.html index 7b6a4c1..ab4a035 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/TurretEncoders.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/TurretEncoders.html @@ -2,7 +2,7 @@ - + TurretEncoders diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Climber.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Climber.html index 093286f..a712177 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Climber.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Climber.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.Climber diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Drivetrain.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Drivetrain.html index 33b9a97..b7220d0 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Drivetrain.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Drivetrain.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.Drivetrain diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/IMotorizedSubsystem.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/IMotorizedSubsystem.html index b5bdfac..2b26299 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/IMotorizedSubsystem.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/IMotorizedSubsystem.html @@ -2,7 +2,7 @@ - + Uses of Interface org.usfirst.frc.team3494.robot.subsystems.IMotorizedSubsystem diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Intake.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Intake.html index e7c5993..e6d2082 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Intake.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Intake.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.Intake diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Kompressor.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Kompressor.html index 4aaed59..da4c172 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Kompressor.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Kompressor.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.Kompressor diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Turret.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Turret.html index 0d61bd2..d94d482 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Turret.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/Turret.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.Turret diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/TurretEncoders.html b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/TurretEncoders.html index c5c6243..127b5bb 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/TurretEncoders.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/class-use/TurretEncoders.html @@ -2,7 +2,7 @@ - + Uses of Class org.usfirst.frc.team3494.robot.subsystems.TurretEncoders diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/package-frame.html b/docs/org/usfirst/frc/team3494/robot/subsystems/package-frame.html index 9e40c1f..bc42ade 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/package-frame.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/package-frame.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.subsystems diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/package-summary.html b/docs/org/usfirst/frc/team3494/robot/subsystems/package-summary.html index c86d944..98cc26b 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/package-summary.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/package-summary.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.subsystems diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/package-tree.html b/docs/org/usfirst/frc/team3494/robot/subsystems/package-tree.html index 45bddf1..eb1b7dc 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/package-tree.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/package-tree.html @@ -2,7 +2,7 @@ - + org.usfirst.frc.team3494.robot.subsystems Class Hierarchy diff --git a/docs/org/usfirst/frc/team3494/robot/subsystems/package-use.html b/docs/org/usfirst/frc/team3494/robot/subsystems/package-use.html index cf5519f..720c2e5 100644 --- a/docs/org/usfirst/frc/team3494/robot/subsystems/package-use.html +++ b/docs/org/usfirst/frc/team3494/robot/subsystems/package-use.html @@ -2,7 +2,7 @@ - + Uses of Package org.usfirst.frc.team3494.robot.subsystems diff --git a/docs/overview-frame.html b/docs/overview-frame.html index af339a3..2a83503 100644 --- a/docs/overview-frame.html +++ b/docs/overview-frame.html @@ -2,7 +2,7 @@ - + Overview List diff --git a/docs/overview-summary.html b/docs/overview-summary.html index 88e6de5..8d0b667 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,7 +2,7 @@ - + Overview diff --git a/docs/overview-tree.html b/docs/overview-tree.html index ab960e9..ed89581 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,7 +2,7 @@ - + Class Hierarchy @@ -90,8 +90,12 @@

    Class Hierarchy

  • edu.wpi.first.wpilibj.command.Command (implements edu.wpi.first.wpilibj.NamedSendable)
    • org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
    • -
    • org.usfirst.frc.team3494.robot.commands.auto.CartesianTurnDrive
    • org.usfirst.frc.team3494.robot.commands.climb.Climb
    • +
    • edu.wpi.first.wpilibj.command.CommandGroup +
        +
      • org.usfirst.frc.team3494.robot.commands.auto.XYDrive
      • +
      +
    • org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
    • org.usfirst.frc.team3494.robot.commands.drive.Drive
    • org.usfirst.frc.team3494.robot.commands.intake.RunIntake
    • From fcaff6fd7ccda2337343f3cd9bf7796f882b268c Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 16:54:57 -0500 Subject: [PATCH 19/46] Format source --- .../usfirst/frc/team3494/robot/subsystems/Drivetrain.java | 6 +++--- .../org/usfirst/frc/team3494/robot/subsystems/Turret.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java index 96ee620..5b0c0fc 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Drivetrain.java @@ -106,7 +106,7 @@ public Drivetrain() { this.encRight = new Encoder(RobotMap.ENCODER_RIGHT_A, RobotMap.ENCODER_RIGHT_B); this.encRight.setDistancePerPulse(1 / 360); this.encRight.reset(); - + this.encLeft = new Encoder(RobotMap.ENCODER_LEFT_A, RobotMap.ENCODER_LEFT_B, true); this.encLeft.setDistancePerPulse(1 / 360); this.encLeft.reset(); @@ -171,7 +171,7 @@ public double getRightDistance(UnitTypes unit) { return this.encRight.get(); } } - + public double getLeftDistance(UnitTypes unit) { double inches = (Math.PI * 4) * (this.encLeft.get() / 360.0D); if (unit.equals(UnitTypes.INCHES)) { @@ -182,7 +182,7 @@ public double getLeftDistance(UnitTypes unit) { return this.encLeft.get(); } } - + /** * Resets the encoder on the right side of the drivetrain. */ diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java index f1b77cd..8009960 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/subsystems/Turret.java @@ -79,7 +79,7 @@ public void turnTurret(DriveDirections dir) { this.turretRing.set(-turretTurnPower); } } - + public void shoot(double power) { this.shooterUpper.set(power); this.shooterLower.set(power); From 873654321d1bcfda7fa5bba6fc012c0ea8e18db9 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 17:01:54 -0500 Subject: [PATCH 20/46] Document new X Y drive --- .../robot/commands/auto/AngleTurn.java | 9 ++- .../robot/commands/auto/DistanceDrive.java | 9 +++ .../team3494/robot/commands/auto/XYDrive.java | 56 +++++++++++-------- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java index fb78840..4aaa079 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.java @@ -6,7 +6,8 @@ /** * Turns the robot using the gyro board mounted to the RoboRIO. The angle to - * turn by must be specified in the constructor. + * turn by must be specified in the constructor. Angle tolerance is specified by + * Robot.prefs (key {@code angle tolerance}.) * * @since 0.0.2 * @see org.usfirst.frc.team3494.robot.Robot @@ -17,6 +18,12 @@ public class AngleTurn extends Command { private double angle; private static double tolerance; + /** + * Constructor. + * + * @param angle + * The number of degrees to turn. + */ public AngleTurn(double angle) { // Use requires() here to declare subsystem dependencies // eg. requires(chassis); diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java index 2513a3b..6b226ff 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/DistanceDrive.java @@ -16,6 +16,15 @@ public class DistanceDrive extends Command { private double dist; private UnitTypes unit; + /** + * Constructor. + * + * @param distance + * The distance to drive. + * @param unitType + * The unit that the distance is in. + * @see org.usfirst.frc.team3494.robot.UnitTypes + */ public DistanceDrive(double distance, UnitTypes unitType) { // Use requires() here to declare subsystem dependencies // eg. requires(chassis); diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java index f5391c1..dffcc2b 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java @@ -6,36 +6,48 @@ import edu.wpi.first.wpilibj.command.CommandGroup; /** - * + * Drives to a point relative to the robot. + * + * @since 0.0.3 */ public class XYDrive extends CommandGroup { - + private double hypot; private double angle; - - public XYDrive(double rise, double run) { + + /** + * Default (and only) constructor. + * + * @param rise + * The distance along the Y axis that the point is from the + * robot. + * @param run + * The distance along the X axis that the point is from the + * robot. + */ + public XYDrive(double rise, double run) { double run2 = run * run; double rise2 = rise * rise; this.hypot = Math.sqrt(run2 + rise2); this.angle = Math.toDegrees(Math.atan2(rise, run)); - requires(Robot.driveTrain); - // Add Commands here: - // e.g. addSequential(new Command1()); - // addSequential(new Command2()); - // these will run in order. - addSequential(new AngleTurn(angle)); - addSequential(new DistanceDrive(hypot, UnitTypes.INCHES)); + requires(Robot.driveTrain); + // Add Commands here: + // e.g. addSequential(new Command1()); + // addSequential(new Command2()); + // these will run in order. + addSequential(new AngleTurn(angle)); + addSequential(new DistanceDrive(hypot, UnitTypes.INCHES)); - // To run multiple commands at the same time, - // use addParallel() - // e.g. addParallel(new Command1()); - // addSequential(new Command2()); - // Command1 and Command2 will run in parallel. + // To run multiple commands at the same time, + // use addParallel() + // e.g. addParallel(new Command1()); + // addSequential(new Command2()); + // Command1 and Command2 will run in parallel. - // A command group will require all of the subsystems that each member - // would require. - // e.g. if Command1 requires chassis, and Command2 requires arm, - // a CommandGroup containing them would require both the chassis and the - // arm. - } + // A command group will require all of the subsystems that each member + // would require. + // e.g. if Command1 requires chassis, and Command2 requires arm, + // a CommandGroup containing them would require both the chassis and the + // arm. + } } From 3675885724ef06e40f2abeb6775f25780572678e Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Sat, 18 Feb 2017 17:02:20 -0500 Subject: [PATCH 21/46] Generate JavaDoc --- docs/allclasses-frame.html | 2 +- docs/allclasses-noframe.html | 2 +- docs/constant-values.html | 2 +- docs/deprecated-list.html | 2 +- docs/help-doc.html | 2 +- docs/index-files/index-1.html | 6 ++++-- docs/index-files/index-10.html | 2 +- docs/index-files/index-11.html | 2 +- docs/index-files/index-12.html | 2 +- docs/index-files/index-13.html | 2 +- docs/index-files/index-14.html | 2 +- docs/index-files/index-15.html | 2 +- docs/index-files/index-16.html | 2 +- docs/index-files/index-17.html | 2 +- docs/index-files/index-18.html | 2 +- docs/index-files/index-19.html | 10 +++++++--- docs/index-files/index-2.html | 2 +- docs/index-files/index-3.html | 6 ++++-- docs/index-files/index-4.html | 2 +- docs/index-files/index-5.html | 2 +- docs/index-files/index-6.html | 2 +- docs/index-files/index-7.html | 2 +- docs/index-files/index-8.html | 2 +- docs/index-files/index-9.html | 2 +- docs/index.html | 2 +- .../frc/team3494/robot/DriveDirections.html | 2 +- docs/org/usfirst/frc/team3494/robot/OI.html | 2 +- .../org/usfirst/frc/team3494/robot/Robot.html | 2 +- .../usfirst/frc/team3494/robot/RobotMap.html | 2 +- .../usfirst/frc/team3494/robot/UnitTypes.html | 2 +- .../robot/class-use/DriveDirections.html | 2 +- .../frc/team3494/robot/class-use/OI.html | 2 +- .../frc/team3494/robot/class-use/Robot.html | 2 +- .../team3494/robot/class-use/RobotMap.html | 2 +- .../team3494/robot/class-use/UnitTypes.html | 6 ++++-- .../robot/commands/auto/AngleTurn.html | 14 +++++++++++--- .../robot/commands/auto/DistanceDrive.html | 14 ++++++++++++-- .../team3494/robot/commands/auto/XYDrive.html | 19 +++++++++++++++++-- .../commands/auto/class-use/AngleTurn.html | 2 +- .../auto/class-use/DistanceDrive.html | 2 +- .../commands/auto/class-use/XYDrive.html | 2 +- .../robot/commands/auto/package-frame.html | 2 +- .../robot/commands/auto/package-summary.html | 6 ++++-- .../robot/commands/auto/package-tree.html | 2 +- .../robot/commands/auto/package-use.html | 2 +- .../team3494/robot/commands/climb/Climb.html | 2 +- .../robot/commands/climb/StopClimber.html | 2 +- .../robot/commands/climb/class-use/Climb.html | 2 +- .../commands/climb/class-use/StopClimber.html | 2 +- .../robot/commands/climb/package-frame.html | 2 +- .../robot/commands/climb/package-summary.html | 2 +- .../robot/commands/climb/package-tree.html | 2 +- .../robot/commands/climb/package-use.html | 2 +- .../team3494/robot/commands/drive/Drive.html | 2 +- .../robot/commands/drive/class-use/Drive.html | 2 +- .../robot/commands/drive/package-frame.html | 2 +- .../robot/commands/drive/package-summary.html | 2 +- .../robot/commands/drive/package-tree.html | 2 +- .../robot/commands/drive/package-use.html | 2 +- .../robot/commands/intake/RunIntake.html | 2 +- .../robot/commands/intake/SwitchPosition.html | 2 +- .../commands/intake/class-use/RunIntake.html | 2 +- .../intake/class-use/SwitchPosition.html | 2 +- .../robot/commands/intake/package-frame.html | 2 +- .../commands/intake/package-summary.html | 2 +- .../robot/commands/intake/package-tree.html | 2 +- .../robot/commands/intake/package-use.html | 2 +- .../robot/commands/package-frame.html | 2 +- .../robot/commands/package-summary.html | 2 +- .../team3494/robot/commands/package-tree.html | 2 +- .../team3494/robot/commands/package-use.html | 2 +- .../frc/team3494/robot/package-frame.html | 2 +- .../frc/team3494/robot/package-summary.html | 2 +- .../frc/team3494/robot/package-tree.html | 2 +- .../frc/team3494/robot/package-use.html | 2 +- .../team3494/robot/subsystems/Climber.html | 2 +- .../team3494/robot/subsystems/Drivetrain.html | 2 +- .../robot/subsystems/IMotorizedSubsystem.html | 2 +- .../frc/team3494/robot/subsystems/Intake.html | 2 +- .../team3494/robot/subsystems/Kompressor.html | 2 +- .../frc/team3494/robot/subsystems/Turret.html | 2 +- .../robot/subsystems/TurretEncoders.html | 2 +- .../robot/subsystems/class-use/Climber.html | 2 +- .../subsystems/class-use/Drivetrain.html | 2 +- .../class-use/IMotorizedSubsystem.html | 2 +- .../robot/subsystems/class-use/Intake.html | 2 +- .../subsystems/class-use/Kompressor.html | 2 +- .../robot/subsystems/class-use/Turret.html | 2 +- .../subsystems/class-use/TurretEncoders.html | 2 +- .../robot/subsystems/package-frame.html | 2 +- .../robot/subsystems/package-summary.html | 2 +- .../robot/subsystems/package-tree.html | 2 +- .../robot/subsystems/package-use.html | 2 +- docs/overview-frame.html | 2 +- docs/overview-summary.html | 2 +- docs/overview-tree.html | 2 +- 96 files changed, 151 insertions(+), 106 deletions(-) diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index a9143ce..0d634ef 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index a7bc0f4..fcc7622 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/constant-values.html b/docs/constant-values.html index ba5e697..0368397 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,7 +2,7 @@ - + Constant Field Values diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index c42cd21..a6b0137 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,7 +2,7 @@ - + Deprecated List diff --git a/docs/help-doc.html b/docs/help-doc.html index 7179d72..50df5b6 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -2,7 +2,7 @@ - + API Help diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index 6079d6f..de7b411 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -2,7 +2,7 @@ - + A-Index @@ -91,7 +91,9 @@

      A

      Turns the robot using the gyro board mounted to the RoboRIO.
  • AngleTurn(double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.AngleTurn
    -
     
    +
    +
    Constructor.
    +
    autonomousCommand - Variable in class org.usfirst.frc.team3494.robot.Robot
     
    autonomousInit() - Method in class org.usfirst.frc.team3494.robot.Robot
    diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index fa503f7..95089c5 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,7 +2,7 @@ - + M-Index diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index 27249de..e2c484b 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -2,7 +2,7 @@ - + O-Index diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index e58a310..a41bc88 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -2,7 +2,7 @@ - + P-Index diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index 90ce14c..b7a8c16 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -2,7 +2,7 @@ - + R-Index diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index dcc4c61..ba93301 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -2,7 +2,7 @@ - + S-Index diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index e8ea495..74446c5 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -2,7 +2,7 @@ - + T-Index diff --git a/docs/index-files/index-16.html b/docs/index-files/index-16.html index 2aa1251..d280874 100644 --- a/docs/index-files/index-16.html +++ b/docs/index-files/index-16.html @@ -2,7 +2,7 @@ - + U-Index diff --git a/docs/index-files/index-17.html b/docs/index-files/index-17.html index d2aec24..db55503 100644 --- a/docs/index-files/index-17.html +++ b/docs/index-files/index-17.html @@ -2,7 +2,7 @@ - + V-Index diff --git a/docs/index-files/index-18.html b/docs/index-files/index-18.html index 0e83668..fc21e08 100644 --- a/docs/index-files/index-18.html +++ b/docs/index-files/index-18.html @@ -2,7 +2,7 @@ - + W-Index diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html index dcbc9b0..d6f8e56 100644 --- a/docs/index-files/index-19.html +++ b/docs/index-files/index-19.html @@ -2,7 +2,7 @@ - + X-Index @@ -89,9 +89,13 @@

    X

    xbox_y - Variable in class org.usfirst.frc.team3494.robot.OI
     
    XYDrive - Class in org.usfirst.frc.team3494.robot.commands.auto
    -
     
    +
    +
    Drives to a point relative to the robot.
    +
    XYDrive(double, double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
    -
     
    +
    +
    Default (and only) constructor.
    +
    A C D E G H I K L M O P R S T U V W X  diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index df5a6c0..67705ea 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -2,7 +2,7 @@ - + C-Index diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index a2d339c..233b403 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,7 +2,7 @@ - + D-Index @@ -91,7 +91,9 @@

    D

    Drives a given distance.
    DistanceDrive(double, UnitTypes) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.DistanceDrive
    -
     
    +
    +
    Constructor.
    +
    Drive - Class in org.usfirst.frc.team3494.robot.commands.drive
    Command to run drivetrain.
    diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index e09385c..f4b5496 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -2,7 +2,7 @@ - + E-Index diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 6267ba3..1752fc8 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,7 +2,7 @@ - + G-Index diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index bd81140..d89c825 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -2,7 +2,7 @@ - + H-Index diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index b383f83..f5ed3fc 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -2,7 +2,7 @@ - + I-Index diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index 959cebb..5b6e169 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -2,7 +2,7 @@ - + K-Index diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index f6232c2..63c6aa6 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -2,7 +2,7 @@ - + L-Index diff --git a/docs/index.html b/docs/index.html index 781452b..31ffca4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ - - - - + <noscript> <div>JavaScript is disabled on your browser.</div> </noscript> <h2>Frame Alert</h2> -<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p> +<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="org/usfirst/frc/team3494/robot/commands/auto/package-summary.html">Non-frame version</a>.</p> diff --git a/docs/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.html b/docs/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.html index dec1251..f593e3c 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/auto/AngleTurn.html @@ -2,7 +2,7 @@ - + AngleTurn @@ -37,8 +37,7 @@ - - -

    Interface Hierarchy

    - -

    Enum Hierarchy

    -
      -
    • java.lang.Object -
        -
      • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) -
      @@ -154,8 +98,7 @@

      Enum Hierarchy

    autoOne() - Static method in class org.usfirst.frc.team3494.robot.AutoGenerator
    -
     
    +
    +
    Test method.
    +
    -A C D E G H I K L M O P R S T U V W X  +A C D E F G H I K L M O P R S T U V W X 
    diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index 0b95519..733d9da 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,8 +2,8 @@ - -M-Index + +L-Index @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ + + + + + +
    + + + + + + + +
    + + +
    A C D E F G H I K L M O P R S T U V W X  + + +

    X

    +
    +
    xbox - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_a - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_b - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_lt - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_rt - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_x - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    xbox_y - Variable in class org.usfirst.frc.team3494.robot.OI
    +
     
    +
    XYDrive - Class in org.usfirst.frc.team3494.robot.commands.auto
    +
    +
    Drives to a point relative to the robot.
    +
    +
    XYDrive(double, double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
    +
    +
    Default (and only) constructor.
    +
    +
    +A C D E F G H I K L M O P R S T U V W X 
    + +
    + + + + + + + +
    + + + + diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index 2f2204a..af22548 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,7 +2,7 @@ - + D-Index @@ -69,7 +69,7 @@
    -
    A C D E G H I K L M O P R S T U V W X  +
    A C D E F G H I K L M O P R S T U V W X 

    D

    @@ -145,7 +145,7 @@

    D

    driveTrainMode - Variable in class org.usfirst.frc.team3494.robot.subsystems.Climber
     
    -A C D E G H I K L M O P R S T U V W X 
    +A C D E F G H I K L M O P R S T U V W X 
    -
    A C D E G H I K L M O P R S T U V W X  +
    A C D E F G H I K L M O P R S T U V W X 

    E

    @@ -115,7 +115,7 @@

    E

    execute() - Method in class org.usfirst.frc.team3494.robot.commands.intake.SwitchPosition
     
    -A C D E G H I K L M O P R S T U V W X 
    +A C D E F G H I K L M O P R S T U V W X 
    diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 618f955..f87ff15 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,8 +2,8 @@ - -G-Index + +F-Index @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ + + + + + + + + + +
    +
    org.usfirst.frc.team3494.robot.vision
    +

    Class GripPipeline

    +
    +
    +
      +
    • java.lang.Object
    • +
    • +
        +
      • org.usfirst.frc.team3494.robot.vision.GripPipeline
      • +
      +
    • +
    +
    +
      +
    • +
      +
      All Implemented Interfaces:
      +
      edu.wpi.first.wpilibj.vision.VisionPipeline
      +
      +
      +
      +
      public class GripPipeline
      +extends java.lang.Object
      +implements edu.wpi.first.wpilibj.vision.VisionPipeline
      +
      GripPipeline class. + +

      + An OpenCV pipeline generated by GRIP. Docs are poor at best. +

      +
      +
      Author:
      +
      GRIP
      +
      +
    • +
    +
    +
    +
      +
    • + +
        +
      • + + +

        Field Summary

        + + + + + + + + + + + + + + + + + + +
        Fields 
        Modifier and TypeField and Description
        private java.util.ArrayList<org.opencv.core.MatOfPoint>filterContoursOutput 
        private java.util.ArrayList<org.opencv.core.MatOfPoint>findContoursOutput 
        private org.opencv.core.MathslThresholdOutput 
        +
      • +
      + +
        +
      • + + +

        Constructor Summary

        + + + + + + + + +
        Constructors 
        Constructor and Description
        GripPipeline() 
        +
      • +
      + +
        +
      • + + +

        Method Summary

        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        All Methods Instance Methods Concrete Methods 
        Modifier and TypeMethod and Description
        private voidfilterContours(java.util.List<org.opencv.core.MatOfPoint> inputContours, + double minArea, + double minPerimeter, + double minWidth, + double maxWidth, + double minHeight, + double maxHeight, + double[] solidity, + double maxVertexCount, + double minVertexCount, + double minRatio, + double maxRatio, + java.util.List<org.opencv.core.MatOfPoint> output) +
        Filters out contours that do not meet certain criteria.
        +
        java.util.ArrayList<org.opencv.core.MatOfPoint>filterContoursOutput() +
        This method is a generated getter for the output of a Filter_Contours.
        +
        private voidfindContours(org.opencv.core.Mat input, + boolean externalOnly, + java.util.List<org.opencv.core.MatOfPoint> contours) +
        Sets the values of pixels in a binary image to their distance to the + nearest black pixel.
        +
        java.util.ArrayList<org.opencv.core.MatOfPoint>findContoursOutput() +
        This method is a generated getter for the output of a Find_Contours.
        +
        private voidhslThreshold(org.opencv.core.Mat input, + double[] hue, + double[] sat, + double[] lum, + org.opencv.core.Mat out) +
        Segment an image based on hue, saturation, and luminance ranges.
        +
        org.opencv.core.MathslThresholdOutput() +
        This method is a generated getter for the output of a HSL_Threshold.
        +
        voidprocess(org.opencv.core.Mat source0) +
        This is the primary method that runs the entire pipeline and updates the + outputs.
        +
        +
          +
        • + + +

          Methods inherited from class java.lang.Object

          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +
        +
      • +
      +
    • +
    +
    +
    +
      +
    • + +
        +
      • + + +

        Field Detail

        + + + +
          +
        • +

          hslThresholdOutput

          +
          private org.opencv.core.Mat hslThresholdOutput
          +
        • +
        + + + +
          +
        • +

          findContoursOutput

          +
          private java.util.ArrayList<org.opencv.core.MatOfPoint> findContoursOutput
          +
        • +
        + + + +
          +
        • +

          filterContoursOutput

          +
          private java.util.ArrayList<org.opencv.core.MatOfPoint> filterContoursOutput
          +
        • +
        +
      • +
      + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          GripPipeline

          +
          public GripPipeline()
          +
        • +
        +
      • +
      + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          process

          +
          public void process(org.opencv.core.Mat source0)
          +
          This is the primary method that runs the entire pipeline and updates the + outputs.
          +
          +
          Specified by:
          +
          process in interface edu.wpi.first.wpilibj.vision.VisionPipeline
          +
          +
        • +
        + + + +
          +
        • +

          hslThresholdOutput

          +
          public org.opencv.core.Mat hslThresholdOutput()
          +
          This method is a generated getter for the output of a HSL_Threshold.
          +
          +
          Returns:
          +
          Mat output from HSL_Threshold.
          +
          +
        • +
        + + + +
          +
        • +

          findContoursOutput

          +
          public java.util.ArrayList<org.opencv.core.MatOfPoint> findContoursOutput()
          +
          This method is a generated getter for the output of a Find_Contours.
          +
          +
          Returns:
          +
          ArrayList<MatOfPoint> output from Find_Contours.
          +
          +
        • +
        + + + +
          +
        • +

          filterContoursOutput

          +
          public java.util.ArrayList<org.opencv.core.MatOfPoint> filterContoursOutput()
          +
          This method is a generated getter for the output of a Filter_Contours.
          +
          +
          Returns:
          +
          ArrayList<MatOfPoint> output from Filter_Contours.
          +
          +
        • +
        + + + +
          +
        • +

          hslThreshold

          +
          private void hslThreshold(org.opencv.core.Mat input,
          +                          double[] hue,
          +                          double[] sat,
          +                          double[] lum,
          +                          org.opencv.core.Mat out)
          +
          Segment an image based on hue, saturation, and luminance ranges.
          +
          +
          Parameters:
          +
          input - The image on which to perform the HSL threshold.
          +
          hue - The min and max hue
          +
          sat - The min and max saturation
          +
          lum - The min and max luminance
          +
          out - The image in which to store the output.
          +
          +
        • +
        + + + +
          +
        • +

          findContours

          +
          private void findContours(org.opencv.core.Mat input,
          +                          boolean externalOnly,
          +                          java.util.List<org.opencv.core.MatOfPoint> contours)
          +
          Sets the values of pixels in a binary image to their distance to the + nearest black pixel.
          +
          +
          Parameters:
          +
          input - The image on which to perform the Distance Transform.
          +
          type - The Transform.
          +
          maskSize - the size of the mask.
          +
          output - The image in which to store the output.
          +
          +
        • +
        + + + +
          +
        • +

          filterContours

          +
          private void filterContours(java.util.List<org.opencv.core.MatOfPoint> inputContours,
          +                            double minArea,
          +                            double minPerimeter,
          +                            double minWidth,
          +                            double maxWidth,
          +                            double minHeight,
          +                            double maxHeight,
          +                            double[] solidity,
          +                            double maxVertexCount,
          +                            double minVertexCount,
          +                            double minRatio,
          +                            double maxRatio,
          +                            java.util.List<org.opencv.core.MatOfPoint> output)
          +
          Filters out contours that do not meet certain criteria.
          +
          +
          Parameters:
          +
          inputContours - is the input list of contours
          +
          output - is the the output list of contours
          +
          minArea - is the minimum area of a contour that will be kept
          +
          minPerimeter - is the minimum perimeter of a contour that will be kept
          +
          minWidth - minimum width of a contour
          +
          maxWidth - maximum width
          +
          minHeight - minimum height
          +
          maxHeight - maximimum height
          +
          solidity - the minimum and maximum solidity of a contour
          +
          minVertexCount - minimum vertex Count of the contours
          +
          maxVertexCount - maximum vertex Count
          +
          minRatio - minimum ratio of width to height
          +
          maxRatio - maximum ratio of width to height
          +
          +
        • +
        +
      • +
      +
    • +
    +
    +
    + + + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/vision/class-use/GripPipeline.html b/docs/org/usfirst/frc/team3494/robot/vision/class-use/GripPipeline.html new file mode 100644 index 0000000..2aa6d06 --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/vision/class-use/GripPipeline.html @@ -0,0 +1,124 @@ + + + + + +Uses of Class org.usfirst.frc.team3494.robot.vision.GripPipeline + + + + + + + + + + + +
    +

    Uses of Class
    org.usfirst.frc.team3494.robot.vision.GripPipeline

    +
    +
    No usage of org.usfirst.frc.team3494.robot.vision.GripPipeline
    + + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/vision/package-frame.html b/docs/org/usfirst/frc/team3494/robot/vision/package-frame.html new file mode 100644 index 0000000..6d1bdaa --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/vision/package-frame.html @@ -0,0 +1,20 @@ + + + + + +org.usfirst.frc.team3494.robot.vision + + + + + +

    org.usfirst.frc.team3494.robot.vision

    +
    +

    Classes

    + +
    + + diff --git a/docs/org/usfirst/frc/team3494/robot/vision/package-summary.html b/docs/org/usfirst/frc/team3494/robot/vision/package-summary.html new file mode 100644 index 0000000..acc7069 --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/vision/package-summary.html @@ -0,0 +1,144 @@ + + + + + +org.usfirst.frc.team3494.robot.vision + + + + + + + + + + + +
    +

    Package org.usfirst.frc.team3494.robot.vision

    +
    +
    +
      +
    • + + + + + + + + + + + + +
      Class Summary 
      ClassDescription
      GripPipeline +
      GripPipeline class.
      +
      +
    • +
    +
    + + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/vision/package-tree.html b/docs/org/usfirst/frc/team3494/robot/vision/package-tree.html new file mode 100644 index 0000000..cdf96ae --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/vision/package-tree.html @@ -0,0 +1,137 @@ + + + + + +org.usfirst.frc.team3494.robot.vision Class Hierarchy + + + + + + + + + + + +
    +

    Hierarchy For Package org.usfirst.frc.team3494.robot.vision

    +Package Hierarchies: + +
    +
    +

    Class Hierarchy

    +
      +
    • java.lang.Object +
        +
      • org.usfirst.frc.team3494.robot.vision.GripPipeline (implements edu.wpi.first.wpilibj.vision.VisionPipeline)
      • +
      +
    • +
    +
    + + + + + + diff --git a/docs/org/usfirst/frc/team3494/robot/vision/package-use.html b/docs/org/usfirst/frc/team3494/robot/vision/package-use.html new file mode 100644 index 0000000..8ca2e97 --- /dev/null +++ b/docs/org/usfirst/frc/team3494/robot/vision/package-use.html @@ -0,0 +1,124 @@ + + + + + +Uses of Package org.usfirst.frc.team3494.robot.vision + + + + + + + + + + + +
    +

    Uses of Package
    org.usfirst.frc.team3494.robot.vision

    +
    +
    No usage of org.usfirst.frc.team3494.robot.vision
    + + + + + + diff --git a/docs/overview-frame.html b/docs/overview-frame.html index 6af1e39..b08d375 100644 --- a/docs/overview-frame.html +++ b/docs/overview-frame.html @@ -2,7 +2,7 @@ - + Overview List @@ -20,6 +20,7 @@

    Packages

  • org.usfirst.frc.team3494.robot.commands.drive
  • org.usfirst.frc.team3494.robot.commands.intake
  • org.usfirst.frc.team3494.robot.subsystems
  • +
  • org.usfirst.frc.team3494.robot.vision
  •  

    diff --git a/docs/overview-summary.html b/docs/overview-summary.html index b4e21b0..b786d78 100644 --- a/docs/overview-summary.html +++ b/docs/overview-summary.html @@ -2,7 +2,7 @@ - + Overview @@ -111,6 +111,10 @@ org.usfirst.frc.team3494.robot.subsystems   + +org.usfirst.frc.team3494.robot.vision +  + diff --git a/docs/overview-tree.html b/docs/overview-tree.html index 79d9761..27cdc74 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -2,7 +2,7 @@ - + Class Hierarchy @@ -79,7 +79,8 @@

    Hierarchy For All Packages

  • org.usfirst.frc.team3494.robot.commands.climb,
  • org.usfirst.frc.team3494.robot.commands.drive,
  • org.usfirst.frc.team3494.robot.commands.intake,
  • -
  • org.usfirst.frc.team3494.robot.subsystems
  • +
  • org.usfirst.frc.team3494.robot.subsystems,
  • +
  • org.usfirst.frc.team3494.robot.vision
  • @@ -105,6 +106,7 @@

    Class Hierarchy

  • org.usfirst.frc.team3494.robot.commands.intake.SwitchPosition
  • +
  • org.usfirst.frc.team3494.robot.vision.GripPipeline (implements edu.wpi.first.wpilibj.vision.VisionPipeline)
  • org.usfirst.frc.team3494.robot.OI
  • edu.wpi.first.wpilibj.RobotBase
      diff --git a/docs/package-list b/docs/package-list index 66385d4..bf6b805 100644 --- a/docs/package-list +++ b/docs/package-list @@ -5,3 +5,4 @@ org.usfirst.frc.team3494.robot.commands.climb org.usfirst.frc.team3494.robot.commands.drive org.usfirst.frc.team3494.robot.commands.intake org.usfirst.frc.team3494.robot.subsystems +org.usfirst.frc.team3494.robot.vision From bb34dd91df8de780a462f9a0880190e4c733ebf3 Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Mon, 20 Feb 2017 13:33:54 -0500 Subject: [PATCH 41/46] Tidy up XYDrive --- .../team3494/robot/commands/auto/XYDrive.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java index dffcc2b..a348559 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java @@ -30,24 +30,7 @@ public XYDrive(double rise, double run) { double rise2 = rise * rise; this.hypot = Math.sqrt(run2 + rise2); this.angle = Math.toDegrees(Math.atan2(rise, run)); - requires(Robot.driveTrain); - // Add Commands here: - // e.g. addSequential(new Command1()); - // addSequential(new Command2()); - // these will run in order. addSequential(new AngleTurn(angle)); addSequential(new DistanceDrive(hypot, UnitTypes.INCHES)); - - // To run multiple commands at the same time, - // use addParallel() - // e.g. addParallel(new Command1()); - // addSequential(new Command2()); - // Command1 and Command2 will run in parallel. - - // A command group will require all of the subsystems that each member - // would require. - // e.g. if Command1 requires chassis, and Command2 requires arm, - // a CommandGroup containing them would require both the chassis and the - // arm. } } From 2ac5e44935d3c56272e1f4747bfd2e47a1aec73a Mon Sep 17 00:00:00 2001 From: Edwan Vi Date: Mon, 20 Feb 2017 13:34:48 -0500 Subject: [PATCH 42/46] Remove unneeded imports --- .../usfirst/frc/team3494/robot/commands/auto/XYDrive.java | 3 +-- docs/allclasses-frame.html | 2 +- docs/allclasses-noframe.html | 2 +- docs/constant-values.html | 2 +- docs/deprecated-list.html | 2 +- docs/help-doc.html | 2 +- docs/index-files/index-1.html | 2 +- docs/index-files/index-10.html | 2 +- docs/index-files/index-11.html | 2 +- docs/index-files/index-12.html | 2 +- docs/index-files/index-13.html | 2 +- docs/index-files/index-14.html | 2 +- docs/index-files/index-15.html | 2 +- docs/index-files/index-16.html | 2 +- docs/index-files/index-17.html | 2 +- docs/index-files/index-18.html | 2 +- docs/index-files/index-19.html | 2 +- docs/index-files/index-2.html | 2 +- docs/index-files/index-20.html | 4 ++-- docs/index-files/index-3.html | 2 +- docs/index-files/index-4.html | 2 +- docs/index-files/index-5.html | 2 +- docs/index-files/index-6.html | 2 +- docs/index-files/index-7.html | 2 +- docs/index-files/index-8.html | 2 +- docs/index-files/index-9.html | 2 +- docs/index.html | 2 +- docs/org/usfirst/frc/team3494/robot/AutoGenerator.html | 2 +- docs/org/usfirst/frc/team3494/robot/DriveDirections.html | 2 +- docs/org/usfirst/frc/team3494/robot/OI.html | 2 +- docs/org/usfirst/frc/team3494/robot/Robot.html | 2 +- docs/org/usfirst/frc/team3494/robot/RobotMap.html | 2 +- docs/org/usfirst/frc/team3494/robot/UnitTypes.html | 2 +- .../usfirst/frc/team3494/robot/class-use/AutoGenerator.html | 2 +- .../frc/team3494/robot/class-use/DriveDirections.html | 2 +- docs/org/usfirst/frc/team3494/robot/class-use/OI.html | 2 +- docs/org/usfirst/frc/team3494/robot/class-use/Robot.html | 2 +- docs/org/usfirst/frc/team3494/robot/class-use/RobotMap.html | 2 +- .../org/usfirst/frc/team3494/robot/class-use/UnitTypes.html | 2 +- .../usfirst/frc/team3494/robot/commands/auto/AngleTurn.html | 2 +- .../frc/team3494/robot/commands/auto/ConstructedAuto.html | 2 +- .../frc/team3494/robot/commands/auto/DistanceDrive.html | 2 +- .../usfirst/frc/team3494/robot/commands/auto/XYDrive.html | 6 +++--- .../team3494/robot/commands/auto/class-use/AngleTurn.html | 2 +- .../robot/commands/auto/class-use/ConstructedAuto.html | 2 +- .../robot/commands/auto/class-use/DistanceDrive.html | 2 +- .../frc/team3494/robot/commands/auto/class-use/XYDrive.html | 2 +- .../frc/team3494/robot/commands/auto/package-frame.html | 2 +- .../frc/team3494/robot/commands/auto/package-summary.html | 2 +- .../frc/team3494/robot/commands/auto/package-tree.html | 2 +- .../frc/team3494/robot/commands/auto/package-use.html | 2 +- .../usfirst/frc/team3494/robot/commands/climb/Climb.html | 2 +- .../frc/team3494/robot/commands/climb/StopClimber.html | 2 +- .../frc/team3494/robot/commands/climb/class-use/Climb.html | 2 +- .../robot/commands/climb/class-use/StopClimber.html | 2 +- .../frc/team3494/robot/commands/climb/package-frame.html | 2 +- .../frc/team3494/robot/commands/climb/package-summary.html | 2 +- .../frc/team3494/robot/commands/climb/package-tree.html | 2 +- .../frc/team3494/robot/commands/climb/package-use.html | 2 +- .../usfirst/frc/team3494/robot/commands/drive/Drive.html | 2 +- .../frc/team3494/robot/commands/drive/class-use/Drive.html | 2 +- .../frc/team3494/robot/commands/drive/package-frame.html | 2 +- .../frc/team3494/robot/commands/drive/package-summary.html | 2 +- .../frc/team3494/robot/commands/drive/package-tree.html | 2 +- .../frc/team3494/robot/commands/drive/package-use.html | 2 +- .../frc/team3494/robot/commands/intake/RunIntake.html | 2 +- .../frc/team3494/robot/commands/intake/SwitchPosition.html | 2 +- .../team3494/robot/commands/intake/class-use/RunIntake.html | 2 +- .../robot/commands/intake/class-use/SwitchPosition.html | 2 +- .../frc/team3494/robot/commands/intake/package-frame.html | 2 +- .../frc/team3494/robot/commands/intake/package-summary.html | 2 +- .../frc/team3494/robot/commands/intake/package-tree.html | 2 +- .../frc/team3494/robot/commands/intake/package-use.html | 2 +- .../usfirst/frc/team3494/robot/commands/package-frame.html | 2 +- .../frc/team3494/robot/commands/package-summary.html | 2 +- .../usfirst/frc/team3494/robot/commands/package-tree.html | 2 +- .../usfirst/frc/team3494/robot/commands/package-use.html | 2 +- docs/org/usfirst/frc/team3494/robot/package-frame.html | 2 +- docs/org/usfirst/frc/team3494/robot/package-summary.html | 2 +- docs/org/usfirst/frc/team3494/robot/package-tree.html | 2 +- docs/org/usfirst/frc/team3494/robot/package-use.html | 2 +- docs/org/usfirst/frc/team3494/robot/subsystems/Climber.html | 2 +- .../usfirst/frc/team3494/robot/subsystems/Drivetrain.html | 2 +- .../frc/team3494/robot/subsystems/IMotorizedSubsystem.html | 2 +- docs/org/usfirst/frc/team3494/robot/subsystems/Intake.html | 2 +- .../usfirst/frc/team3494/robot/subsystems/Kompressor.html | 2 +- docs/org/usfirst/frc/team3494/robot/subsystems/Turret.html | 2 +- .../frc/team3494/robot/subsystems/TurretEncoders.html | 2 +- .../frc/team3494/robot/subsystems/class-use/Climber.html | 2 +- .../frc/team3494/robot/subsystems/class-use/Drivetrain.html | 2 +- .../robot/subsystems/class-use/IMotorizedSubsystem.html | 2 +- .../frc/team3494/robot/subsystems/class-use/Intake.html | 2 +- .../frc/team3494/robot/subsystems/class-use/Kompressor.html | 2 +- .../frc/team3494/robot/subsystems/class-use/Turret.html | 2 +- .../team3494/robot/subsystems/class-use/TurretEncoders.html | 2 +- .../frc/team3494/robot/subsystems/package-frame.html | 2 +- .../frc/team3494/robot/subsystems/package-summary.html | 2 +- .../usfirst/frc/team3494/robot/subsystems/package-tree.html | 2 +- .../usfirst/frc/team3494/robot/subsystems/package-use.html | 2 +- .../org/usfirst/frc/team3494/robot/vision/GripPipeline.html | 2 +- .../frc/team3494/robot/vision/class-use/GripPipeline.html | 2 +- .../usfirst/frc/team3494/robot/vision/package-frame.html | 2 +- .../usfirst/frc/team3494/robot/vision/package-summary.html | 2 +- .../org/usfirst/frc/team3494/robot/vision/package-tree.html | 2 +- docs/org/usfirst/frc/team3494/robot/vision/package-use.html | 2 +- docs/overview-frame.html | 2 +- docs/overview-summary.html | 2 +- docs/overview-tree.html | 2 +- 108 files changed, 111 insertions(+), 112 deletions(-) diff --git a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java index a348559..4c22e5d 100644 --- a/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java +++ b/3494_2017_repo/src/org/usfirst/frc/team3494/robot/commands/auto/XYDrive.java @@ -1,6 +1,5 @@ package org.usfirst.frc.team3494.robot.commands.auto; -import org.usfirst.frc.team3494.robot.Robot; import org.usfirst.frc.team3494.robot.UnitTypes; import edu.wpi.first.wpilibj.command.CommandGroup; @@ -16,7 +15,7 @@ public class XYDrive extends CommandGroup { private double angle; /** - * Default (and only) constructor. + * Constructor. * * @param rise * The distance along the Y axis that the point is from the diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index dc7507a..2b41a53 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index 40c427f..fa2bfee 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/constant-values.html b/docs/constant-values.html index bc8a172..80e74f6 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,7 +2,7 @@ - + Constant Field Values diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index 8d4a358..abb844d 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,7 +2,7 @@ - + Deprecated List diff --git a/docs/help-doc.html b/docs/help-doc.html index 73075f6..82be32e 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -2,7 +2,7 @@ - + API Help diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index e9d1d7b..985a0dc 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -2,7 +2,7 @@ - + A-Index diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index 733d9da..e3da6a7 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,7 +2,7 @@ - + L-Index diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index 1e4a5b4..7f5230c 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -2,7 +2,7 @@ - + M-Index diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index 07f4c9f..83111dc 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -2,7 +2,7 @@ - + O-Index diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index cdbf786..7b37c0e 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -2,7 +2,7 @@ - + P-Index diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index f35b96a..754ce49 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -2,7 +2,7 @@ - + R-Index diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index 6f7b52a..deffd02 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -2,7 +2,7 @@ - + S-Index diff --git a/docs/index-files/index-16.html b/docs/index-files/index-16.html index 93a09a9..bcda201 100644 --- a/docs/index-files/index-16.html +++ b/docs/index-files/index-16.html @@ -2,7 +2,7 @@ - + T-Index diff --git a/docs/index-files/index-17.html b/docs/index-files/index-17.html index 5bec154..4fd55e6 100644 --- a/docs/index-files/index-17.html +++ b/docs/index-files/index-17.html @@ -2,7 +2,7 @@ - + U-Index diff --git a/docs/index-files/index-18.html b/docs/index-files/index-18.html index b028a12..1d955a4 100644 --- a/docs/index-files/index-18.html +++ b/docs/index-files/index-18.html @@ -2,7 +2,7 @@ - + V-Index diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html index d9bf382..f414b46 100644 --- a/docs/index-files/index-19.html +++ b/docs/index-files/index-19.html @@ -2,7 +2,7 @@ - + W-Index diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index 867c410..d15a704 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -2,7 +2,7 @@ - + C-Index diff --git a/docs/index-files/index-20.html b/docs/index-files/index-20.html index 50d6834..f0fba0d 100644 --- a/docs/index-files/index-20.html +++ b/docs/index-files/index-20.html @@ -2,7 +2,7 @@ - + X-Index @@ -94,7 +94,7 @@

      X

      XYDrive(double, double) - Constructor for class org.usfirst.frc.team3494.robot.commands.auto.XYDrive
      -
      Default (and only) constructor.
      +
      Constructor.
      A C D E F G H I K L M O P R S T U V W X 
  • diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index af22548..75ef235 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,7 +2,7 @@ - + D-Index diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index 8ca2340..92dd5ff 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -2,7 +2,7 @@ - + E-Index diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index f87ff15..d483c15 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,7 +2,7 @@ - + F-Index diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index d4e67c9..d6fbe50 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -2,7 +2,7 @@ - + G-Index diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index 5ed8510..1a50916 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -2,7 +2,7 @@ - + H-Index diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index 6cb5d57..ae9ac4e 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -2,7 +2,7 @@ - + I-Index diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index d3001cb..7dd66d6 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -2,7 +2,7 @@ - + K-Index diff --git a/docs/index.html b/docs/index.html index db3ceaa..bf4f450 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@ - - - - + <noscript> <div>JavaScript is disabled on your browser.</div> </noscript> <h2>Frame Alert</h2> -<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="overview-summary.html">Non-frame version</a>.</p> +<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="org/usfirst/frc/team3494/robot/commands/drive/package-summary.html">Non-frame version</a>.</p> diff --git a/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html b/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html index cc54059..fc31f10 100644 --- a/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html +++ b/docs/org/usfirst/frc/team3494/robot/commands/drive/Drive.html @@ -2,7 +2,7 @@ - + Drive @@ -37,8 +37,7 @@ @@ -308,8 +310,7 @@

    interrupted