projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement RunFLyWheel class, add motor methods to Shooter class
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
Robot.java
diff --git
a/src/org/usfirst/frc/team3501/robot/Robot.java
b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5b0f35e01656a4fd26370230fbd4e7eeb7a8eaec..580173e19262c066bff984edfff37c9bb64478f5 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-12,6
+12,8
@@
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
private static Shooter shooter;
private static OI oi;
private static DriveTrain driveTrain;
private static Shooter shooter;
private static OI oi;
+ private static Shooter shooter;
+ private static OI oi;
private static Intake intake;
@Override
private static Intake intake;
@Override
@@
-34,6
+36,14
@@
public class Robot extends IterativeRobot {
return OI.getOI();
}
return OI.getOI();
}
+ public static Shooter getShooter() {
+ return Shooter.getShooter();
+ }
+
+ public static OI getOI() {
+ return OI.getOI();
+ }
+
public static Intake getIntake() {
return Intake.getIntake()
}
public static Intake getIntake() {
return Intake.getIntake()
}