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 b18f7a5bec59dad0a6f5e85873f08e936cc4400d..00ad1cb9d8f13168f8c5668f155c113f2bdbb09f 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-9,6
+9,7
@@
import edu.wpi.first.wpilibj.command.Scheduler;
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
public class Robot extends IterativeRobot {
private static DriveTrain driveTrain;
+ private static Shooter shooter;
private static OI oi;
private static Shooter shooter;
private static OI oi;
private static Shooter shooter;
@@
-24,6
+25,10
@@
public class Robot extends IterativeRobot {
return DriveTrain.getDriveTrain();
}
return DriveTrain.getDriveTrain();
}
+ public static Shooter getShooter() {
+ return Shooter.getShooter();
+ }
+
public static OI getOI() {
return OI.getOI();
}
public static OI getOI() {
return OI.getOI();
}