From 8a04ae942301bd98f318845ca5bba116c70ee53e Mon Sep 17 00:00:00 2001 From: Aarav Shah Date: Sat, 25 Sep 2021 10:23:46 -0600 Subject: [PATCH] DataDataData --- src/main/deploy/Robot Data - Distances.csv | 30 +++++++++---------- .../java/frc4388/robot/RobotContainer.java | 7 +++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/deploy/Robot Data - Distances.csv b/src/main/deploy/Robot Data - Distances.csv index 5dcc108..a5df015 100644 --- a/src/main/deploy/Robot Data - Distances.csv +++ b/src/main/deploy/Robot Data - Distances.csv @@ -1,16 +1,16 @@ Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg) -0,17,12000,1, -65.9,17,12000,1, -103,20,12000,1, -126.6,21.28,12000,1.5, -156.6,29,12000,1.5, -174,29,12000,1.5, -178,29,12000,1.3 -180,29.5,12000,1.3, -185.85,29.5,12000,1.3, -187,29.5,12000,1.3 -200,29.4,12000,1.3 -231,29.4,12000,1.8, -245,29.8,12000,1.8, -262,29.8,12000,1.8, -999,29.8,12000,1.8, \ No newline at end of file +0,16.3,12000,1, +65.9,16.3,12000,1, +103,19.3,12000,1, +126.6,20.58,12000,1.5, +156.6,28.3,12000,1.5, +174,28.3,12000,1.5, +178,28.3,12000,1.3 +180,28.8,12000,1.3, +185.85,28.8,12000,1.3, +187,28.8,12000,1.3 +200,28.8,12000,1.3 +231,28.7,12000,1.8, +245,29.1,12000,1.8, +262,29.1,12000,1.8, +999,29.1,12000,1.8, \ No newline at end of file diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 60ab631..104b9cd 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -475,12 +475,13 @@ public class RobotContainer { "5BallBottom3" }; m_fiveBallBottom = new FiveBallBottom(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(fiveBallBottomPaths)); - + */ + /* String[] offTheLinePaths = new String[]{ "getOffLine1" }; - m_offTheLine = new OffTheLine(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(fiveBallBottomPaths)); - + m_offTheLine = new OffTheLine(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(offTheLinePaths)); + /* Command[] autos = {m_sixBallTop, m_eightBallMid, m_fiveBallBottom, m_offTheLine}; autoCommandChooser.setDefaultOption("sixBallTop", m_sixBallTop); for (int i = 1; i < autos.length; i++) {