Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/usfirst/frc/team5401/robot/commands/Climb.java|org/usfirst/frc/team5401/robot/commands/feederArmUpDown.java|org/usfirst/frc/team5401/robot/commands/feederControl.java|org/usfirst/frc/team5401/robot/commands/feederInOut.java|org/usfirst/frc/team5401/robot/commands/loadShooter.java|org/usfirst/frc/team5401/robot/commands/PopGear.java|org/usfirst/frc/team5401/robot/commands/toggleCompressor.java|org/usfirst/frc/team5401/robot/commands/unjamIn.java|org/usfirst/frc/team5401/robot/commands/unjamToggle.java" kind="src" path="src"/>
<classpathentry excluding="org/usfirst/frc/team5401/robot/commands/toggleCompressor.java|org/usfirst/frc/team5401/robot/commands/unjamIn.java|org/usfirst/frc/team5401/robot/commands/unjamToggle.java|org/usfirst/frc/team5401/robot/subsystems/CompressorSubsystem.java|org/usfirst/frc/team5401/robot/subsystems/ExampleSubsystem.java|org/usfirst/frc/team5401/robot/subsystems/Unjammer.java|org/usfirst/frc/team5401/robot/commands/Climb.java|org/usfirst/frc/team5401/robot/subsystems/Climber.java|org/usfirst/frc/team5401/robot/commands/PopGear.java|org/usfirst/frc/team5401/robot/subsystems/GearMechanism.java|org/usfirst/frc/team5401/robot/commands/loadShooter.java|org/usfirst/frc/team5401/robot/subsystems/Loader.java" kind="src" path="src"/>
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="var" path="USERLIBS_DIR/navx_frc.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file added build/jars/NetworkTables.jar
Binary file not shown.
Binary file added build/jars/WPILib.jar
Binary file not shown.
Binary file added build/jars/cscore.jar
Binary file not shown.
Binary file added build/jars/navx_frc.jar
Binary file not shown.
Binary file added build/jars/opencv.jar
Binary file not shown.
Binary file modified build/org/usfirst/frc/team5401/robot/OI.class
Binary file not shown.
Binary file modified build/org/usfirst/frc/team5401/robot/Robot.class
Binary file not shown.
Binary file modified build/org/usfirst/frc/team5401/robot/RobotMap.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added dist/FRCUserProgram.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/org/usfirst/frc/team5401/robot/OI.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ else if (value < -.5){
//Feeder In/Out
public int getTriggers_Operator(){
double left = operatorCtrlr.getRawAxis(RobotMap.LEFT_TRIGGER_AXIS);
double right = operatorCtrlr.getRawAxis(RobotMap.LEFT_TRIGGER_AXIS);
double right = operatorCtrlr.getRawAxis(RobotMap.RIGHT_TRIGGER_AXIS);
if (right > .1){
return 1;
}
Expand Down
38 changes: 19 additions & 19 deletions src/org/usfirst/frc/team5401/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,35 @@
*/
public class Robot extends IterativeRobot {

public static DriveBase driveBase;
public static Loader loader;
public static GearMechanism gearMechanism;
public static Unjammer unjammer;
public static CompressorSubsystem compressorsubsystem;
// public static DriveBase driveBase;
// public static Loader loader;
// public static GearMechanism gearMechanism;
// public static Unjammer unjammer;
// public static CompressorSubsystem compressorsubsystem;
public static Infeed infeed;
public static Climber climber;
// public static Climber climber;
public static OI oi;

Command autonomousCommand;
SendableChooser chooser;
// Command autonomousCommand;
// SendableChooser chooser;

/**
* This function is run when the robot is first started up and should be
* used for any initialization code.
*/
@Override
public void robotInit() {
driveBase = new DriveBase();
loader = new Loader();
gearMechanism = new GearMechanism();
unjammer = new Unjammer();
compressorsubsystem = new CompressorSubsystem();
// driveBase = new DriveBase();
// loader = new Loader();
// gearMechanism = new GearMechanism();
// unjammer = new Unjammer();
// compressorsubsystem = new CompressorSubsystem();
infeed = new Infeed();
climber = new Climber();
// climber = new Climber();
oi = new OI();

// chooser.addObject("My Auto", new MyAutoCommand());
SmartDashboard.putData("Auto mode", chooser);
// SmartDashboard.putData("Auto mode", chooser);
}

/**
Expand Down Expand Up @@ -78,7 +78,7 @@ public void disabledPeriodic() {
*/
@Override
public void autonomousInit() {
autonomousCommand = (Command) chooser.getSelected();
// autonomousCommand = (Command) chooser.getSelected();

/*
* String autoSelected = SmartDashboard.getString("Auto Selector",
Expand All @@ -88,7 +88,7 @@ public void autonomousInit() {
*/

// schedule the autonomous command (example)
if (autonomousCommand != null) autonomousCommand.start();
// if (autonomousCommand != null) autonomousCommand.start();

}

Expand All @@ -106,8 +106,8 @@ public void teleopInit() {
// teleop starts running. If you want the autonomous to
// continue until interrupted by another command, remove
// this line or comment it out.
if (autonomousCommand != null)
autonomousCommand.cancel();
// if (autonomousCommand != null)
// autonomousCommand.cancel();
}

/**
Expand Down
12 changes: 6 additions & 6 deletions src/org/usfirst/frc/team5401/robot/RobotMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ public class RobotMap {
//PWM Motors
public static final int LEFT_DRIVE_MOTOR_1 = 0;
public static final int RIGHT_DRIVE_MOTOR_1 = 1;
public static final int LEFT_DRIVE_MOTOR_2 = 3;
public static final int LEFT_DRIVE_MOTOR_2 = 2;
public static final int RIGHT_DRIVE_MOTOR_2 = 4;
public static final int INFEEDER_BAR = 5;
public static final int INFEEDER_BAR = 3;
public static final int CLIMBER_MOTOR = 6;

//Sensors
Expand All @@ -50,12 +50,12 @@ public class RobotMap {
public static final int PCM_ID = 0;
public static final int SHIFTER_IN = 0;
public static final int SHIFTER_OUT = 1;
public static final int GEAR_DOOR_CLOSE = 2;
public static final int GEAR_DOOR_OPEN = 3;
// public static final int GEAR_DOOR_CLOSE = 2;
// public static final int GEAR_DOOR_OPEN = 3;
public static final int UNJAM_IN = 4;
public static final int UNJAM_OUT = 5;
public static final int INFEED_IN = 6;
public static final int INFEED_OUT = 7;
public static final int INFEED_IN = 3;
public static final int INFEED_OUT = 2;

//Analog
public static final int PRESSURE_SENSOR = 0;
Expand Down
48 changes: 0 additions & 48 deletions src/org/usfirst/frc/team5401/robot/commands/Climb.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/org/usfirst/frc/team5401/robot/commands/PopGear.java

This file was deleted.

42 changes: 0 additions & 42 deletions src/org/usfirst/frc/team5401/robot/commands/loadShooter.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/org/usfirst/frc/team5401/robot/commands/toggleCompressor.java

This file was deleted.

39 changes: 0 additions & 39 deletions src/org/usfirst/frc/team5401/robot/commands/unjamIn.java

This file was deleted.

48 changes: 0 additions & 48 deletions src/org/usfirst/frc/team5401/robot/commands/unjamToggle.java

This file was deleted.

Loading