From b092ede21d02f15a37d04916df1a6eabd5940213 Mon Sep 17 00:00:00 2001 From: Rohan Rodrigues Date: Wed, 8 Mar 2017 16:56:39 -0800 Subject: [PATCH] Fixed conflict --- src/org/usfirst/frc/team3501/robot/Constants.java | 5 +++++ .../robot/commands/shooter/RunIndexWheelContinuous.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 312e0c3..197f76e 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -40,11 +40,16 @@ public class Constants { public final static int HALL_EFFECT_PORT = 9; +<<<<<<< HEAD public final static int TOGGLE_INDEXER = 8; public static final int MODULE_NUMBER = 10, PISTON_FORWARD = 4, PISTON_REVERSE = 5; +======= + public static final int PISTON_MODULE = 10, PISTON_FORWARD = 0, + PISTON_REVERSE = 1; +>>>>>>> Add code to alternate pistons in runIndexWheelContinuous public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward; public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse; } 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 ccc0e43..48f3546 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java @@ -36,7 +36,7 @@ public class RunIndexWheelContinuous extends Command { @Override protected void execute() { - if (t.get() >= 1) { + if (t.get() > 1) { if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) { Shooter.getShooter().setHighGear(); } else { -- 2.30.2