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

updated auto and buttons

Browse Source
This commit is contained in:
Adam Long 2016-09-22 21:50:07 +00:00
parent 77bd25c69d
commit 05d435c64c
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ public class OI {
} }
// Print log when button 1 pressed // Print log when button 1 pressed
//joystickButtons[0][0].whenPressed(new LogEncoder()); //joystickButtons[0][0].whenPressed(new LogEncoder());
joystickButtons[0][1].whileHeld(new SetShooterState(true)); joystickButtons[0][0].whileHeld(new SetShooterState(true));
joystickButtons[0][3].whileHeld(new SpinRollers(1)); joystickButtons[0][3].whileHeld(new SpinRollers(1));
// joystickButtons[0][2].whileHeld(new PIDDrive(400)); // joystickButtons[0][2].whileHeld(new PIDDrive(400));
joystickButtons[1][0].whileHeld(new MoveArm(1)); joystickButtons[1][0].whileHeld(new MoveArm(1));

1
src/org/usfirst/frc/team2059/robot/commands/autonomous/RoutineDriveTime.java
View File

@ -5,6 +5,7 @@ import org.usfirst.frc.team2059.robot.Robot;
public class RoutineDriveTime extends CommandGroup { public class RoutineDriveTime extends CommandGroup {
public RoutineDriveTime() { public RoutineDriveTime() {
addSequential(new AutoResetLower(-1)); addSequential(new AutoResetLower(-1));
addSequential(new AutoSetArmStopState(true));
addSequential(new AutoDriveTime(2, .5)); addSequential(new AutoDriveTime(2, .5));
} }
} }

2
src/org/usfirst/frc/team2059/robot/commands/drivetrain/Drive.java
View File

@ -17,7 +17,7 @@ public class Drive extends CommandBase {
double x = Robot.oi.getJoysticks()[0].getRawAxis(0); double x = Robot.oi.getJoysticks()[0].getRawAxis(0);
double y = Robot.oi.getJoysticks()[0].getRawAxis(1); double y = Robot.oi.getJoysticks()[0].getRawAxis(1);
double z = Robot.oi.getJoysticks()[0].getRawAxis(2); double z = Robot.oi.getJoysticks()[0].getRawAxis(2);
if(Robot.oi.getJoysticks()[0].getRawButton(1)){ if(Robot.oi.getJoysticks()[0].getRawButton(2)){
sensitivity = 1; sensitivity = 1;
}else{ }else{
sensitivity = 0.5; sensitivity = 0.5;

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

@ -52,11 +52,9 @@ public class MainArm extends PIDSubsystem {
} }
public void resetUpper(double speed) { public void resetUpper(double speed) {
if (getTopPressed()) { if (getTopPressed()) {
System.out.println("PRESSDE");
moveArm(0); moveArm(0);
return; return;
} else { } else {
System.out.println("not pressed");
moveArm(speed); moveArm(speed);
} }
} }