Fix conflict in indexer piston

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5e9bd3cbdb496727cd9722efc1630c5ad13c2228..66b7f47dd13c1b47c9858dfbeeb1f67ff64f3610 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -59,7 +59,10 @@ public class Robot extends IterativeRobot {
   @Override
   public void autonomousInit() {
     driveTrain.setHighGear();
+<<<<<<< HEAD
     driveTrain.setCANTalonsBrakeMode(driveTrain.DRIVE_COAST_MODE);
+=======
+>>>>>>> Add code to toggle agitator pistons in RunIndexWheelContinuous
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
index 062da20f01a5dd73c36a3dcfcd34f2c227f9a420..ccc0e4374d6223121eefff87bc28ced1bee495c2 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -1,12 +1,8 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
-import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.Constants;
+import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
-<<<<<<< HEAD
-=======
-
->>>>>>> Remove getters for shift pistons
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;
 
@@ -35,16 +31,12 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected void initialize() {
-<<<<<<< HEAD
     t.start();
-=======
-    t.reset();
->>>>>>> Remove getters for shift pistons
   }
 
   @Override
   protected void execute() {
-    if (t.get() > 1) {
+    if (t.get() >= 1) {
       if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
         Shooter.getShooter().setHighGear();
       } else {