From 1a0fee0b54047e63d2c63122c85097a4ae52609b Mon Sep 17 00:00:00 2001 From: lhmcgann Date: Sat, 13 Jan 2018 16:15:11 -0800 Subject: [PATCH 1/4] added subsystems and interfaces subsystems and interfaces: Lift, Climber, ClimberAssist, IntakeEject added "implements (interface) in each subsystem did not include drivetrain or auto bc other peopl already doing that --- .DS_Store | Bin 0 -> 6148 bytes .../team199/Robot2018/subsystems/Climber.java | 18 ++++++++++++++++++ .../Robot2018/subsystems/ClimberAssist.java | 18 ++++++++++++++++++ .../subsystems/ClimberAssistInterface.java | 5 +++++ .../subsystems/ClimberInterface.java | 5 +++++ .../Robot2018/subsystems/IntakeEject.java | 18 ++++++++++++++++++ .../subsystems/IntakeEjectInterface.java | 5 +++++ .../team199/Robot2018/subsystems/Lift.java | 18 ++++++++++++++++++ .../Robot2018/subsystems/LiftInterface.java | 5 +++++ 9 files changed, 92 insertions(+) create mode 100644 .DS_Store create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1f40b6921ebe46b3cd4fc1dd6ba36983ef4d18ab GIT binary patch literal 6148 zcmeHKJ5EC}5S)b+K{P2TeFQ>9X+_}zaDgaE8R->3|EipeqcQs_h#u*ZCYqJjW3P8? zd5X7h0odw$zXTQl=5$9KeVCf>yHD({B1WY1j4!<48B4tGKPTD$2b}wWcMRCl|L}K* z?JyjCTP6jhfE17dQa}n^P=PA0^T!LGsiUNT6u1oq{QJ=8j=gY9j86xLXaR^bhQm0I zUV_*>KQsCMO`~t-s6VU(w literal 0 HcmV?d00001 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..7094e2d --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java @@ -0,0 +1,18 @@ +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. + + 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..800863f --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java @@ -0,0 +1,18 @@ +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. + + 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..e116151 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java @@ -0,0 +1,5 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface ClimberAssistInterface { + +} 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..32f4a04 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java @@ -0,0 +1,5 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface ClimberInterface { + +} 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..b9c2a1c --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java @@ -0,0 +1,18 @@ +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. + + 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..8a46a11 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java @@ -0,0 +1,5 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface IntakeEjectInterface { + +} 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..f650e22 --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java @@ -0,0 +1,18 @@ +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. + + 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..99134dc --- /dev/null +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java @@ -0,0 +1,5 @@ +package org.usfirst.frc.team199.Robot2018.subsystems; + +public interface LiftInterface { + +} From af8b25bb55474e4fb208dc3b3c75ada2216d3c26 Mon Sep 17 00:00:00 2001 From: lhmcgann Date: Sat, 13 Jan 2018 16:24:00 -0800 Subject: [PATCH 2/4] more subsystem/interface setup put initDefaultCommand method in interfaces added javadocs for initDefaultCommand method in each subsystem declared and initialized subsystems in Robot --- .../src/org/usfirst/frc/team199/Robot2018/Robot.java | 11 ++++++++++- .../frc/team199/Robot2018/subsystems/Climber.java | 5 ++++- .../team199/Robot2018/subsystems/ClimberAssist.java | 5 ++++- .../Robot2018/subsystems/ClimberAssistInterface.java | 7 ++++++- .../Robot2018/subsystems/ClimberInterface.java | 7 ++++++- .../frc/team199/Robot2018/subsystems/IntakeEject.java | 5 ++++- .../Robot2018/subsystems/IntakeEjectInterface.java | 7 ++++++- .../frc/team199/Robot2018/subsystems/Lift.java | 5 ++++- .../team199/Robot2018/subsystems/LiftInterface.java | 7 ++++++- 9 files changed, 50 insertions(+), 9 deletions(-) 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/subsystems/Climber.java b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java index 7094e2d..e8b5bce 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Climber.java @@ -9,7 +9,10 @@ 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 index 800863f..b094647 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssist.java @@ -9,7 +9,10 @@ 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 index e116151..71325af 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberAssistInterface.java @@ -1,5 +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 index 32f4a04..2f37fb0 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/ClimberInterface.java @@ -1,5 +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 index b9c2a1c..768e4e5 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEject.java @@ -9,7 +9,10 @@ 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 index 8a46a11..1a38594 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/IntakeEjectInterface.java @@ -1,5 +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 index f650e22..da2d37b 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/Lift.java @@ -9,7 +9,10 @@ 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 index 99134dc..f09e665 100644 --- a/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java +++ b/Robot2018/src/org/usfirst/frc/team199/Robot2018/subsystems/LiftInterface.java @@ -1,5 +1,10 @@ package org.usfirst.frc.team199.Robot2018.subsystems; public interface LiftInterface { - + + /** + * Set the default command for a subsystem here. + * */ + public void initDefaultCommand(); + } From 9aaa6bb42baa0f56dd28406422ed8823e798b432 Mon Sep 17 00:00:00 2001 From: lhmcgann Date: Sun, 14 Jan 2018 10:23:39 -0800 Subject: [PATCH 3/4] deleted .DS_Store actual file and reference in .gitignore --- Robot2018/.gitignore | 1 - 1 file changed, 1 deletion(-) 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 From e2259e612c235df0bba468ce5eed805f24f8076e Mon Sep 17 00:00:00 2001 From: lhmcgann Date: Sun, 14 Jan 2018 10:40:09 -0800 Subject: [PATCH 4/4] added file to commands package added a README to commands package so doesn't disappear in github --- .../src/org/usfirst/frc/team199/Robot2018/commands/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/README.md 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