Changed stuff

This commit is contained in:
Aarav Shah
2021-10-04 17:02:05 -06:00
parent 8a04ae9423
commit dc61e69777
3 changed files with 30 additions and 18 deletions
+15 -15
View File
@@ -1,16 +1,16 @@
Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg)
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,
0,16,12000,1,
65.9,16,12000,1,
103,19,12000,1,
126.6,20.28,12000,1.5,
156.6,28,12000,1.5,
174,28,12000,1.5,
178,28,12000,1.3
180,28.5,12000,1.3,
185.85,28.5,12000,1.3,
187,28.5,12000,1.3
200,28.5,12000,1.3
231,28.4,12000,1.8,
245,28.8,12000,1.8,
262,28.8,12000,1.8,
999,28.8,12000,1.8,
1 Distance (in),Hood Ext. (u),Drum Velocity (u/ds),Center Displacment (deg)
2 0,16.3,12000,1, 0,16,12000,1,
3 65.9,16.3,12000,1, 65.9,16,12000,1,
4 103,19.3,12000,1, 103,19,12000,1,
5 126.6,20.58,12000,1.5, 126.6,20.28,12000,1.5,
6 156.6,28.3,12000,1.5, 156.6,28,12000,1.5,
7 174,28.3,12000,1.5, 174,28,12000,1.5,
8 178,28.3,12000,1.3 178,28,12000,1.3
9 180,28.8,12000,1.3, 180,28.5,12000,1.3,
10 185.85,28.8,12000,1.3, 185.85,28.5,12000,1.3,
11 187,28.8,12000,1.3 187,28.5,12000,1.3
12 200,28.8,12000,1.3 200,28.5,12000,1.3
13 231,28.7,12000,1.8, 231,28.4,12000,1.8,
14 245,29.1,12000,1.8, 245,28.8,12000,1.8,
15 262,29.1,12000,1.8, 262,28.8,12000,1.8,
16 999,29.1,12000,1.8, 999,28.8,12000,1.8,
@@ -315,6 +315,11 @@ public class RobotContainer {
//.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET))
.whenReleased(new InstantCommand(() -> m_robotLime.limeOff()));
// new JoystickButton(getOperatorJoystick(), XboxController.LEFT_RIGHT_DPAD_AXIS)
// .whileHeld(new ShootPrepGroup(m_robotShooter, m_robotShooterAim, m_robotShooterHood, m_robotStorage), false)
// //.whenReleased(new ManageStorage(m_robotStorage, StorageMode.RESET))
// .whenReleased(new InstantCommand(() -> m_robotLime.limeOff()));
//Run drum
@@ -476,7 +481,7 @@ public class RobotContainer {
};
m_fiveBallBottom = new FiveBallBottom(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(fiveBallBottomPaths));
*/
/*
String[] offTheLinePaths = new String[]{
"getOffLine1"
};
@@ -36,8 +36,15 @@ public class RunLevelerWithJoystick extends CommandBase {
// Called every time the scheduler runs while the command is scheduled.
@Override
public void execute() {
double input = m_controller.getRightXAxis();
m_leveler.runLeveler(input);
double input = m_controller.getDpadAngle();
if (input == 90)
{
m_leveler.runLeveler(0.5);
}
else if (input == 270)
{
m_leveler.runLeveler(-0.5);
}
}
// Called once the command ends or is interrupted.