From a4e99721c66bf58635eae0a089ddb26c1c237c07 Mon Sep 17 00:00:00 2001 From: Arunima DIvya Date: Mon, 30 Jan 2017 19:20:45 -0800 Subject: [PATCH] Fix rebase conflicts, by delete shifter instance --- src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index ef40903..bf29438 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -68,6 +68,10 @@ public class DriveTrain extends Subsystem { BNO055.vector_type_t.VECTOR_EULER, Port.kOnboard, (byte) 0x28); gyroZero = imu.getHeading(); + leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER, + Constants.DriveTrain.LEFT_FORWARD, Constants.DriveTrain.LEFT_REVERSE); + rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER, + Constants.DriveTrain.RIGHT_FORWARD, Constants.DriveTrain.RIGHT_REVERSE); } public static DriveTrain getDriveTrain() { -- 2.30.2