rename

Author: willson0v0

src/org/usfirst/frc/team6414/robot/Robot.java

@@ -8,8 +8,8 @@
 import edu.wpi.first.wpilibj.livewindow.LiveWindow;
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
-import org.usfirst.frc.team6414.robot.commands.Autonomous;
-import org.usfirst.frc.team6414.robot.commands.Autonomous2;
+import org.usfirst.frc.team6414.robot.commands.BaseLine;
+import org.usfirst.frc.team6414.robot.commands.HangGear;
 import org.usfirst.frc.team6414.robot.subsystems.*;
 
 /**
@@ -43,8 +43,8 @@ public static double limit(double min, double max, double input) {
      */
     @Override
     public void robotInit() {
-        chooser.addDefault("gear", new Autonomous());
-        chooser.addObject("baseline", new Autonomous2());
+        chooser.addDefault("gear", new HangGear());
+        chooser.addObject("baseline", new BaseLine());
         SmartDashboard.putData("Auto", chooser);
 
         oi = new OI();
@@ -111,7 +111,7 @@ public void autonomousInit() {
 		 */
 
         // schedule the autonomous command (example)
-//        autonomousCommand = new Autonomous2();
+//        autonomousCommand = new BaseLine();
         autonomousCommand.start();
     }
 

…team6414/robot/commands/Autonomous2.java …rc/team6414/robot/commands/BaseLine.javasrc/org/usfirst/frc/team6414/robot/commands/Autonomous2.java renamed to src/org/usfirst/frc/team6414/robot/commands/BaseLine.java src/org/usfirst/frc/team6414/robot/commands/Autonomous2.java renamed to src/org/usfirst/frc/team6414/robot/commands/BaseLine.java

@@ -11,9 +11,9 @@
  * @author willson
  *         published under GNU Protocol
  */
-public class Autonomous2 extends Command {
+public class BaseLine extends Command {
 
-    public Autonomous2() {
+    public BaseLine() {
         requires(Robot.chassis);
     }
 
@@ -26,28 +26,28 @@ protected void initialize() {
         this.setTimeout(RobotMap.AUTO_TIMEOUT2);
     }
 
-    /**
+    /*
      * constructor
      * speed: max=1, min=0, f'(x)=-2sqrt(a)/(2sqrt(-x+a))
      * f(x)=sqrt(-x+a)/sqrt(a) => sqrt(-x/a+1)
      *
      * @param distant distant form robot to the wall of control station (average)
      * @return the speed it should go at a certain distance. Closer, slower.
      */
-    private double speed(double distant) {
-        return Math.sqrt(-distant / RobotMap.START_DISTANT + 1);
-    }
+//    private double speed(double distant) {
+//        return Math.sqrt(-distant / RobotMap.START_DISTANT + 1);
+//    }
 
-    /**
+    /*
      * get turning speed
      *
      * @return From 0.5 to -0.5. Reach Max / Min when perform a 45 degree angle to the wall
      */
-    private double getRotate() {
-        return Robot.limit(-1, 1,
-                (Robot.uSensor.getRightDistant() - Robot.uSensor.getLeftDistant())
-                        / 2 * Math.sqrt(2) * RobotMap.SENSOR_DIST);
-    }
+//    private double getRotate() {
+//        return Robot.limit(-1, 1,
+//                (Robot.uSensor.getRightDistant() - Robot.uSensor.getLeftDistant())
+//                        / 2 * Math.sqrt(2) * RobotMap.SENSOR_DIST);
+//    }
 
     /**
      * The execute method is called repeatedly when this Command is

…/team6414/robot/commands/Autonomous.java …rc/team6414/robot/commands/HangGear.javasrc/org/usfirst/frc/team6414/robot/commands/Autonomous.java renamed to src/org/usfirst/frc/team6414/robot/commands/HangGear.java src/org/usfirst/frc/team6414/robot/commands/Autonomous.java renamed to src/org/usfirst/frc/team6414/robot/commands/HangGear.java

@@ -11,9 +11,9 @@
  * @author willson
  *         published under GNU Protocol
  */
-public class Autonomous extends Command {
+public class HangGear extends Command {
 
-    public Autonomous() {
+    public HangGear() {
         requires(Robot.chassis);
     }
 
@@ -26,28 +26,28 @@ protected void initialize() {
         this.setTimeout(RobotMap.AUTO_TIMEOUT);
     }
 
-    /**
+    /*
      * constructor
      * speed: max=1, min=0, f'(x)=-2sqrt(a)/(2sqrt(-x+a))
      * f(x)=sqrt(-x+a)/sqrt(a) => sqrt(-x/a+1)
      *
      * @param distant distant form robot to the wall of control station (average)
      * @return the speed it should go at a certain distance. Closer, slower.
      */
-    private double speed(double distant) {
-        return Math.sqrt(-distant / RobotMap.START_DISTANT + 1);
-    }
+//    private double speed(double distant) {
+//        return Math.sqrt(-distant / RobotMap.START_DISTANT + 1);
+//    }
 
-    /**
+    /*
      * get turning speed
      *
      * @return From 0.5 to -0.5. Reach Max / Min when perform a 45 degree angle to the wall
      */
-    private double getRotate() {
-        return Robot.limit(-1, 1,
-                (Robot.uSensor.getRightDistant() - Robot.uSensor.getLeftDistant())
-                        / 2 * Math.sqrt(2) * RobotMap.SENSOR_DIST);
-    }
+//    private double getRotate() {
+//        return Robot.limit(-1, 1,
+//                (Robot.uSensor.getRightDistant() - Robot.uSensor.getLeftDistant())
+//                        / 2 * Math.sqrt(2) * RobotMap.SENSOR_DIST);
+//    }
 
     /**
      * The execute method is called repeatedly when this Command is

src/org/usfirst/frc/team6414/robot/subsystems/USensor.java

@@ -75,7 +75,7 @@ public double getDistant() {
 
     @Override
     protected void initDefaultCommand() {
-//        setDefaultCommand(new Autonomous());
+//        setDefaultCommand(new HangGear());
     }
 }