diff --git a/src/main/deploy/Robot Data - Distances.csv b/src/main/deploy/Robot Data - Distances.csv index 4f2fb07..8b68b83 100644 --- a/src/main/deploy/Robot Data - Distances.csv +++ b/src/main/deploy/Robot Data - Distances.csv @@ -3,9 +3,10 @@ Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg) 65.9,16,6000,1, 103,19,6600,1, 126.6,20.25,7000,1.5, -156.6,22,7500,1.5, -180,24,8000,2, -185.85,26.5,9000,2.5, +156.6,23,7500,1.5, +174,30,12000,1.5, +180,30,12000,1.3, +185.85,30,12000,1.3, 231,28.8,9500,1.8, 245,28.8,9500,1.8, 262,28.8,9500,1.8, diff --git a/src/main/deploy/Robot Data - DistancesOLD.csv b/src/main/deploy/Robot Data - DistancesOLD.csv index a508fbc..65b84e8 100644 --- a/src/main/deploy/Robot Data - DistancesOLD.csv +++ b/src/main/deploy/Robot Data - DistancesOLD.csv @@ -31,9 +31,19 @@ IN BETWEEN HOLD 0,16,6000,1, 65.9,16,6000,1, -126.6,20.25,7000,0.95, -180,24,8000,1, -185.85,26.5, 9000,1.625, -245,28.9,9500,.98, -262,28.9,9500,.98, -999,28.9,9500,.98, \ No newline at end of file +103,19,6600,1, +126.6,20.25,7000,1.5, +156.6,22,7500,1.5, +174,23,8000,1.5, +180,23,8000,1.3, +185.85,26.5,9000,1.3, +231,28.8,9500,1.8, +245,28.8,9500,1.8, +262,28.8,9500,1.8, +999,28.8,9500,1.8, + + + + + + diff --git a/src/main/driverStation/GOAT DRIVERSTATION.json b/src/main/driverStation/GOAT DRIVERSTATION.json index 5035189..486a0fe 100644 --- a/src/main/driverStation/GOAT DRIVERSTATION.json +++ b/src/main/driverStation/GOAT DRIVERSTATION.json @@ -1144,9 +1144,9 @@ } ], "windowGeometry": { - "x": -7.199999809265137, - "y": -7.199999809265137, - "width": 1550.4000244140625, - "height": 838.4000244140625 + "x": -6.400000095367432, + "y": 1.600000023841858, + "width": 1547.199951171875, + "height": 828.7999877929688 } } \ 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 9578a71..315aa66 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -233,7 +233,7 @@ public class RobotContainer { //.whenPressed(new ShootFullGroup(m_robotShooter, m_robotShooterAim, m_robotShooterHood, m_robotStorage), false); //.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET)); //.whenReleased(new RunCommand(() -> m_robotLime.limeOff())); - .whenPressed(new RunCommand(() -> m_robotStorage.runStorage(0.3), m_robotStorage)) + .whenPressed(new RunCommand(() -> m_robotStorage.runStorage(0.5), m_robotStorage)) .whenReleased(new InterruptSubystem(m_robotStorage)); // extends or retracts the extender