From 538715b1e58e3217a6411fab2471716700350b51 Mon Sep 17 00:00:00 2001 From: Arunima DIvya Date: Wed, 1 Feb 2017 21:07:51 -0800 Subject: [PATCH] Check before auton if both gears have the same value --- src/org/usfirst/frc/team3501/robot/Robot.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 908a52d..db5e469 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,9 +1,6 @@ package org.usfirst.frc.team3501.robot; -<<<<<<< HEAD -======= import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance; ->>>>>>> fix bugs import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; import org.usfirst.frc.team3501.robot.subsystems.Intake; import org.usfirst.frc.team3501.robot.subsystems.Shooter; @@ -41,12 +38,15 @@ public class Robot extends IterativeRobot { return Intake.getIntake(); } + // If the gear values do not match in the left and right piston, then they are + // both set to high gear @Override public void autonomousInit() { -<<<<<<< HEAD -======= Scheduler.getInstance().add(new DriveDistance(25, 10)); ->>>>>>> fix bugs + if (driveTrain.getLeftGearPistonValue() != driveTrain + .getRightGearPistonValue()) { + driveTrain.setHighGear(); + } } @Override @@ -57,6 +57,7 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { + } @Override -- 2.30.2