move instantiation of physical components to map

[ozzloy@gmail.com/3501-spark-go] / src / org / usfirst / frc / team3501 / robot / RobotMap.java

diff --git a/src/org/usfirst/frc/team3501/robot/RobotMap.java b/src/org/usfirst/frc/team3501/robot/RobotMap.java
index 8cfb7fb99c177da473e8d069096e0f8690a798c6..f3528cbde0f59f89cb89b044e37275db10557148 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/RobotMap.java
+++ b/src/org/usfirst/frc/team3501/robot/RobotMap.java
@@ -1,8 +1,11 @@
 package org.usfirst.frc.team3501.robot;
 
+import edu.wpi.first.wpilibj.CANJaguar;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
+import edu.wpi.first.wpilibj.SpeedController;
 
 public class RobotMap {
+
     // driver station
     public static final int LEFT_JOYSTICK_PORT = 0, RIGHT_JOYSTICK_PORT = 1;
 
@@ -10,22 +13,19 @@ public class RobotMap {
                                MIN_ARM_JOYSTICK_INPUT   = 0.1;
 
     // drivetrain
-    public static final int FRONT_LEFT_ADDRESS = 4, FRONT_RIGHT_ADDRESS = 5,
-                            REAR_LEFT_ADDRESS  = 3, REAR_RIGHT_ADDRESS  = 6;
+    public static final SpeedController
+      frontLeft  = new CANJaguar(4), frontRight = new CANJaguar(5),
+      rearLeft   = new CANJaguar(3), rearRight  = new CANJaguar(6);
 
     public static final double MAX_DRIVE_SPEED = 0.7;
 
-    // claw
-    public static final int CLAW_FORWARD_CHANNEL = 0, CLAW_REVERSE_CHANNEL = 1;
-
-    public static final Value OPEN = Value.kForward, CLOSED = Value.kReverse;
-
     // arm
     public static final int LEFT_WINCH_ADDRESS = 2, RIGHT_WINCH_ADDRESS = 7;
 
     public static final double ARM_ADJUST_SPEED = 0.3;
 
-    // auton
-    public static final double OVER_STEP_TIME = 1.2, OVER_STEP_SPEED = 0.7,
-                               PAST_STEP_TIME = 1.5, PAST_STEP_SPEED = 0.5;
+    // claw
+    public static final int CLAW_FORWARD_CHANNEL = 0, CLAW_REVERSE_CHANNEL = 1;
+
+    public static final Value OPEN = Value.kForward, CLOSED = Value.kReverse;
 }