oops tab -> spaces

[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..c9c43d42f118444400680bb701d1cc9ceea5fdf0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -15,36 +15,36 @@ import org.usfirst.frc.team3501.util.AutonData;
 
 public class Robot extends IterativeRobot {
 
-       public static Drivetrain drivetrain;
-       public static Arm arm;
-       public static Claw claw;
+    public static Drivetrain drivetrain;
+    public static Arm arm;
+    public static Claw claw;
 
-       public static Pneumatics pneumatics;
+    public static Pneumatics pneumatics;
 
-       public static OI oi;
+    public static OI oi;
 
-       public static AutonData autonData;
+    public static AutonData autonData;
 
-       private SendableChooser autonChooser;
+    private SendableChooser autonChooser;
     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();
+        pneumatics = new Pneumatics();
 
-               pneumatics = new Pneumatics();
+        autonData = new AutonData();
 
-               autonData = new AutonData();
+        oi = new OI();
 
-               chooseAuto();
+        chooseAuto();
     }
 
-       public void disabledPeriodic() {
-               Scheduler.getInstance().run();
-       }
+    public void disabledPeriodic() {
+        Scheduler.getInstance().run();
+    }
 
     public void autonomousInit() {
         schedule(new TurnOnCompressor());
@@ -62,7 +62,8 @@ public class Robot extends IterativeRobot {
     public void teleopInit() {
         schedule(new TurnOnCompressor());
 
-        autonomousCommand.cancel();
+        if (autonomousCommand != null)
+            autonomousCommand.cancel();
     }
 
     public void teleopPeriodic() {