From: Rohan Rodrigues <rohanrodrigues19@gmail.com>
Date: Thu, 9 Mar 2017 01:12:31 +0000 (-0800)
Subject: Fix conflict in indexer piston
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=b30e6822d5baa8ebff5f6320a4d7da9c992fd4a7

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 5e9bd3c..66b7f47 100644
--- 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 062da20..ccc0e43 100644
--- 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 {