projects
/
ozzloy@gmail.com
/
3501-spark-go
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make so does not crash
[ozzloy@gmail.com/3501-spark-go]
/
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 c7ef783478c8307e5b01d3e5ae714dd192e9b887..84fd2f9faa8afa3fc1726a564d18c5abcae4433e 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-29,8
+29,6
@@
public class Robot extends IterativeRobot {
private Command autonomousCommand;
public void robotInit() {
private Command autonomousCommand;
public void robotInit() {
- oi = new OI();
-
drivetrain = new Drivetrain();
arm = new Arm();
claw = new Claw();
drivetrain = new Drivetrain();
arm = new Arm();
claw = new Claw();
@@
-39,6
+37,8
@@
public class Robot extends IterativeRobot {
autonData = new AutonData();
autonData = new AutonData();
+ oi = new OI();
+
chooseAuto();
}
chooseAuto();
}
@@
-62,7
+62,8
@@
public class Robot extends IterativeRobot {
public void teleopInit() {
schedule(new TurnOnCompressor());
public void teleopInit() {
schedule(new TurnOnCompressor());
- autonomousCommand.cancel();
+ if (autonomousCommand != null)
+ autonomousCommand.cancel();
}
public void teleopPeriodic() {
}
public void teleopPeriodic() {