team2059/ford-java
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed pot values

Browse Source
This commit is contained in:
Adam Long 2016-10-15 19:03:39 +00:00
parent 77f44f8c36
commit 54a7f87eb3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/usfirst/frc/team2059/robot/OI.java
View File

@ -50,10 +50,12 @@ public class OI {
// joystickButtons[0][2].whileHeld(new PIDDrive(400)); // joystickButtons[0][2].whileHeld(new PIDDrive(400));
//joystickButtons[1][2].whileHeld(new SetArmPosition(RobotMap.mainArmPresetCollect)); //joystickButtons[1][2].whileHeld(new SetArmPosition(RobotMap.mainArmPresetCollect));
joystickButtons[1][0].whileHeld(new AlignVertical()); joystickButtons[1][0].whileHeld(new AlignVertical());
joystickButtons[1][1].whileHeld(new SetShooterState(true));
joystickButtons[1][2].whileHeld(new ResetLower(-1)); joystickButtons[1][2].whileHeld(new ResetLower(-1));
joystickButtons[1][3].whileHeld(new SetArmPosition(RobotMap.mainArmPresetTraverse)); joystickButtons[1][3].whileHeld(new SetArmPosition(RobotMap.mainArmPresetTraverse));
joystickButtons[1][4].whileHeld(new SetArmPosition(RobotMap.mainArmPresetCloseShot)); joystickButtons[1][4].whileHeld(new SetArmPosition(RobotMap.mainArmPresetCloseShot));
joystickButtons[1][5].whileHeld(new SetArmPosition(RobotMap.mainArmPresetLowShot)); joystickButtons[1][5].whileHeld(new SpinRollers(1, false));
// joystickButtons[1][5].whileHeld(new SetArmPosition(RobotMap.mainArmPresetLowShot));
joystickButtons[1][7].whileHeld(new MoveArm(1)); joystickButtons[1][7].whileHeld(new MoveArm(1));
joystickButtons[1][8].whileHeld(new MoveArm(-1)); joystickButtons[1][8].whileHeld(new MoveArm(-1));
} }

6
src/org/usfirst/frc/team2059/robot/RobotMap.java
View File

@ -9,9 +9,9 @@ public class RobotMap {
public static int driveLeftEncoderB = 1; public static int driveLeftEncoderB = 1;
public static int gyro = 1; public static int gyro = 1;
//Arm //Arm
public static double zeroDegrees = 1.469; public static double zeroDegrees = 1.28;
public static double ninetyDegrees = 3.274; public static double ninetyDegrees = 3.1;
public static int armPot = 0; public static int armPot = 3;
public static int armLeftMotor = 5; public static int armLeftMotor = 5;
public static int armRightMotor = 6; public static int armRightMotor = 6;
public static int armBottomLim = 4; public static int armBottomLim = 4;

3
src/org/usfirst/frc/team2059/robot/subsystems/MainArm.java
View File

@ -19,7 +19,8 @@ public class MainArm extends PIDSubsystem {
super("MainArm", 0.06, 0.0, 0.002); super("MainArm", 0.06, 0.0, 0.002);
getPIDController().setContinuous(false); getPIDController().setContinuous(false);
setSetpoint(70); setSetpoint(70);
enable(); // enable();
disable();
} }
public void initDefaultCommand() { public void initDefaultCommand() {
} }