From e7553681b646a0803a3715a9f76eef63d0850f87 Mon Sep 17 00:00:00 2001 From: Cindy Zhang Date: Tue, 16 Feb 2016 15:14:06 -0800 Subject: [PATCH] comment out anything irrelevant to intake arm in Robot.java --- src/org/usfirst/frc/team3501/robot/Robot.java | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 71e156b6..377b4af8 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -4,9 +4,11 @@ import org.usfirst.frc.team3501.robot.Constants.Defense; import org.usfirst.frc.team3501.robot.subsystems.DefenseArm; import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; import org.usfirst.frc.team3501.robot.subsystems.IntakeArm; +import org.usfirst.frc.team3501.robot.subsystems.Photogate; import org.usfirst.frc.team3501.robot.subsystems.Scaler; import org.usfirst.frc.team3501.robot.subsystems.Shooter; +import edu.wpi.first.wpilibj.I2C; import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.command.Scheduler; import edu.wpi.first.wpilibj.smartdashboard.SendableChooser; @@ -22,22 +24,25 @@ public class Robot extends IterativeRobot { public static IntakeArm intakeArm; public static DefenseArm defenseArm; + public static Photogate photogate; + // Sendable Choosers send a drop down menu to the Smart Dashboard. SendableChooser positionChooser; SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense, positionFourDefense, positionFiveDefense; + // Gyro stuff + public GyroLib gyro; + @Override public void robotInit() { driveTrain = new DriveTrain(); oi = new OI(); shooter = new Shooter(); + scaler = new Scaler(); + intakeArm = new IntakeArm(); - // shooter = new Shooter(); - // scaler = new Scaler(); - // intakeArm = new IntakeArm(); - // // initializeSendableChoosers(); // addPositionChooserOptions(); // addDefensesToAllDefenseSendableChoosers(); @@ -103,14 +108,23 @@ public class Robot extends IterativeRobot { public void autonomousInit() { Scheduler.getInstance().run(); - // Scheduler.getInstance().add(new DriveDistance(24, 5)); - // Scheduler.getInstance().add(new DriveForTime(2, 0.3)); - // Scheduler.getInstance().add(new TurnForAngle(90, 5)); - // Scheduler.getInstance().add( - // new TurnForTime(3, Constants.Direction.RIGHT, 0.3)); - // Scheduler.getInstance().add( - // new TurnForTime(3, Constants.Direction.LEFT, 0.3)); - // Scheduler.getInstance().add(new Turn180()); + // // get options chosen from drop down menu + // Integer chosenPosition = (Integer) positionChooser.getSelected(); + // Integer chosenDefense = 0; + // + // if (chosenPosition == 1) + // chosenDefense = (Integer) positionOneDefense.getSelected(); + // else if (chosenPosition == 2) + // chosenDefense = (Integer) positionTwoDefense.getSelected(); + // else if (chosenPosition == 3) + // chosenDefense = (Integer) positionThreeDefense.getSelected(); + // else if (chosenPosition == 4) + // chosenDefense = (Integer) positionFourDefense.getSelected(); + // else if (chosenPosition == 5) + // chosenDefense = (Integer) positionFiveDefense.getSelected(); + // + // System.out.println("Chosen Position: " + chosenPosition); + // System.out.println("Chosen Defense: " + chosenDefense); } @Override -- 2.30.2