X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fcommands%2FAlignToScore.java;h=bb3c3cb8c734edbf0c492effc43b7c1274536d62;hb=0d4900b66e3664b8ffaee0f5ca380da93437b0ae;hp=8285a95c326f7f394b52c62874c73e0589049cd3;hpb=4347c80de453a878b5e54ce912c5111740ec1a2a;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java b/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java
index 8285a95c..bb3c3cb8 100755
--- a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java
@@ -1,10 +1,19 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.robot.Robot;
+
 import edu.wpi.first.wpilibj.command.CommandGroup;
 
 /**
  * This command group will be used in autonomous. Based on what position the
- * robot is in, the robot will align with the goal
+ * robot is in, the robot will align with the goal. In the Software 2015-2016
+ * Google folder is a picture explaining each of the cases.
+ *
+ * dependency on sensors: lidars, encoders, gyro
+ *
+ * dependency on subsystems: drivetrain
+ *
+ * dependency on other commands: TurnForAngle(), DriveForDistance()
  *
  * pre-condition: robot is flush against a defense at the specified position in
  * the opponent's courtyard
@@ -14,53 +23,112 @@ import edu.wpi.first.wpilibj.command.CommandGroup;
  *
  */
 public class AlignToScore extends CommandGroup {
+  private final static double CENTER_OF_MASS_TO_ROBOT_FRONT = 0;
+  private final static double DIST_CASTLE_WALL_TO_SIDE_GOAL = 0;
+  private final static double DIST_CASTLE_WALL_TO_FRONT_GOAL = 0;
+
   private final double DEFAULT_SPEED = 0.5;
-  // constants for position 1: low bar
 
+  // constants for position 1: low bar
   private final double POS1_DIST1 = 0;
   private final double POS1_TURN1 = 0;
   private final double POS1_DIST2 = 0;
 
   // constants for position 2
-
   private final double POS2_DIST1 = 0;
   private final double POS2_TURN1 = 0;
   private final double POS2_DIST2 = 0;
 
   // constants for position 3
+  private final double POS3_DIST1 = 0;
+  private final double POS3_TURN1 = 0;
+  private final double POS3_DIST2 = 0;
+  private final double POS3_TURN2 = 0;
+  private final double POS3_DIST3 = 0;
 
   // constants for position 4
+  private final double POS4_DIST1 = 0;
+  private final double POS4_TURN1 = 0;
+  private final double POS4_DIST2 = 0;
+  private final double POS4_TURN2 = 0;
+  private final double POS4_DIST3 = 0;
 
   // constants for position 5
+  private final double POS5_DIST1 = 0;
+  private final double POS5_TURN1 = 0;
+  private final double POS5_DIST2 = 0;
+
+  public double horizontalDistToGoal;
 
   public AlignToScore(int position) {
 
-    switch (position) {
+    if (position == 1) {
 
-    // position 1 is always the low bar
-    case 1:
+      // position 1 is always the low bar
+
+      addSequential(new DriveForDistance(POS1_DIST1, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS1_TURN1));
+      addSequential(new DriveForDistance(POS1_DIST2, DEFAULT_SPEED));
+      horizontalDistToGoal = 0;
+    } else if (position == 2) {
 
       addSequential(new DriveForDistance(POS2_DIST1, DEFAULT_SPEED));
       addSequential(new TurnForAngle(POS2_TURN1));
       addSequential(new DriveForDistance(POS2_DIST2, DEFAULT_SPEED));
+      horizontalDistToGoal = 0;
 
-    case 2:
+    } else if (position == 3) {
 
-      addSequential(new DriveForDistance(POS1_DIST1, DEFAULT_SPEED));
-      addSequential(new TurnForAngle(POS1_TURN1));
-      addSequential(new DriveForDistance(POS1_DIST2, DEFAULT_SPEED));
+      addSequential(new DriveForDistance(POS3_DIST1, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS3_TURN1));
+      addSequential(new DriveForDistance(POS3_DIST2, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS3_TURN2));
+      addSequential(new DriveForDistance(POS3_DIST3, DEFAULT_SPEED));
+      horizontalDistToGoal = 0;
 
-    case 3:
+    } else if (position == 4) {
 
-      addSequential();
+      addSequential(new DriveForDistance(POS4_DIST1, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS4_TURN1));
+      addSequential(new DriveForDistance(POS4_DIST2, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS4_TURN2));
+      addSequential(new DriveForDistance(POS4_DIST3, DEFAULT_SPEED));
+      horizontalDistToGoal = 0;
 
-    case 4:
+    } else if (position == 5) {
 
-      addSequential();
+      addSequential(new DriveForDistance(POS5_DIST1, DEFAULT_SPEED));
+      addSequential(new TurnForAngle(POS5_TURN1));
+      addSequential(new DriveForDistance(POS5_DIST2, DEFAULT_SPEED));
+      horizontalDistToGoal = 0;
+    }
+  }
 
-    case 5:
+  public static double lidarCalculateAngleToTurn(int position,
+      double horizontalDistToGoal) {
+    double leftDist = Robot.driveTrain.getLeftLidarDistance();
+    double rightDist = Robot.driveTrain.getRightLidarDistance();
+
+    double errorAngle = Math.atan(Math.abs(leftDist - rightDist) / 2);
+    double distToTower;
+    // TODO: figure out if we do want to shoot into the side goal if we are
+    // in position 1 or 2, or if we want to change that
+    if (position == 1 || position == 2) {
+      distToTower = Math
+          .cos(CENTER_OF_MASS_TO_ROBOT_FRONT + (leftDist - rightDist) / 2)
+          - DIST_CASTLE_WALL_TO_SIDE_GOAL;
+    }
 
-      addSequential();
+    // TODO: figure out if we do want to shoot into the font goal if we are
+    // in position 3, 4, 5, or if we want to change that
+    else {
+      distToTower = Math
+          .cos(CENTER_OF_MASS_TO_ROBOT_FRONT + (leftDist - rightDist) / 2)
+          - DIST_CASTLE_WALL_TO_SIDE_GOAL;
     }
+
+    double angleToTurn = Math.atan(distToTower / horizontalDistToGoal);
+
+    return angleToTurn;
   }
 }