diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..1f40b69 Binary files /dev/null and b/.DS_Store differ diff --git a/Robot2018/.gitignore b/Robot2018/.gitignore index 8470e34..2384283 100644 --- a/Robot2018/.gitignore +++ b/Robot2018/.gitignore @@ -1,4 +1,3 @@ /bin/ /build/ /dist/ -.DS_Store diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java index 7cfbae7..af7db2e 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java @@ -1,6 +1,11 @@ package org.usfirst.frc.team199.Robot2018; +import org.usfirst.frc.team199.Robot2018.subsystems.Climber; +import org.usfirst.frc.team199.Robot2018.subsystems.ClimberAssist; +import org.usfirst.frc.team199.Robot2018.subsystems.IntakeEject; +import org.usfirst.frc.team199.Robot2018.subsystems.Lift; + import edu.wpi.first.wpilibj.IterativeRobot; import edu.wpi.first.wpilibj.command.Command; import edu.wpi.first.wpilibj.command.Scheduler; @@ -16,7 +21,11 @@ * directory. */ public class Robot extends IterativeRobot { - + + public static final Climber climber = new Climber(); + public static final ClimberAssist climberAssist = new ClimberAssist(); + public static final IntakeEject intakeEject = new IntakeEject(); + public static final Lift lift = new Lift(); public static OI oi; Command autonomousCommand; diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/README.md b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/README.md new file mode 100644 index 0000000..68ec2d4 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/README.md @@ -0,0 +1 @@ +This package is for commands. \ No newline at end of file diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java new file mode 100644 index 0000000..e8b5bce --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java @@ -0,0 +1,21 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +import edu.wpi.first.wpilibj.command.Subsystem; + +/** + * + */ +public class Climber extends Subsystem implements ClimberInterface { + + // Put methods for controlling this subsystem + // here. Call these from Commands. + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand() { + // Set the default command for a subsystem here. + //setDefaultCommand(new MySpecialCommand()); + } +} + diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java new file mode 100644 index 0000000..b094647 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java @@ -0,0 +1,21 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +import edu.wpi.first.wpilibj.command.Subsystem; + +/** + * + */ +public class ClimberAssist extends Subsystem implements ClimberAssistInterface { + + // Put methods for controlling this subsystem + // here. Call these from Commands. + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand() { + // Set the default command for a subsystem here. + //setDefaultCommand(new MySpecialCommand()); + } +} + diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java new file mode 100644 index 0000000..71325af --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java @@ -0,0 +1,10 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface ClimberAssistInterface { + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand(); + +} diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java new file mode 100644 index 0000000..2f37fb0 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java @@ -0,0 +1,10 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface ClimberInterface { + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand(); + +} diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java new file mode 100644 index 0000000..768e4e5 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java @@ -0,0 +1,21 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +import edu.wpi.first.wpilibj.command.Subsystem; + +/** + * + */ +public class IntakeEject extends Subsystem implements IntakeEjectInterface { + + // Put methods for controlling this subsystem + // here. Call these from Commands. + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand() { + // Set the default command for a subsystem here. + //setDefaultCommand(new MySpecialCommand()); + } +} + diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java new file mode 100644 index 0000000..1a38594 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java @@ -0,0 +1,10 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface IntakeEjectInterface { + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand(); + +} diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java new file mode 100644 index 0000000..da2d37b --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java @@ -0,0 +1,21 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +import edu.wpi.first.wpilibj.command.Subsystem; + +/** + * + */ +public class Lift extends Subsystem implements LiftInterface { + + // Put methods for controlling this subsystem + // here. Call these from Commands. + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand() { + // Set the default command for a subsystem here. + //setDefaultCommand(new MySpecialCommand()); + } +} + diff --git a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java new file mode 100644 index 0000000..f09e665 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java @@ -0,0 +1,10 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface LiftInterface { + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand(); + +}