Revert "Intake FIx"

This reverts commit 988c3bf88b.
This commit is contained in:
Shikhar
2026-04-10 13:09:10 -06:00
parent 988c3bf88b
commit 5797032aeb
5 changed files with 10 additions and 11 deletions
@@ -45,7 +45,7 @@
{ {
"type": "wait", "type": "wait",
"data": { "data": {
"waitTime": 4.5 "waitTime": 4.2
} }
}, },
{ {
@@ -63,7 +63,7 @@
{ {
"type": "named", "type": "named",
"data": { "data": {
"name": "Robot Half Shot" "name": "Robot Shoot"
} }
} }
] ]
@@ -87,7 +87,7 @@
{ {
"type": "wait", "type": "wait",
"data": { "data": {
"waitTime": 1.25 "waitTime": 1.5
} }
}, },
{ {
@@ -59,7 +59,7 @@
"maxAngularVelocity": 600.0, "maxAngularVelocity": 600.0,
"maxAngularAcceleration": 750.0, "maxAngularAcceleration": 750.0,
"nominalVoltage": 12.0, "nominalVoltage": 12.0,
"unlimited": true "unlimited": false
}, },
"goalEndState": { "goalEndState": {
"velocity": 0.0, "velocity": 0.0,
@@ -71,5 +71,5 @@
"velocity": 0.0, "velocity": 0.0,
"rotation": -90.0 "rotation": -90.0
}, },
"useDefaultConstraints": false "useDefaultConstraints": true
} }
@@ -79,7 +79,7 @@
"maxAngularVelocity": 600.0, "maxAngularVelocity": 600.0,
"maxAngularAcceleration": 750.0, "maxAngularAcceleration": 750.0,
"nominalVoltage": 12.0, "nominalVoltage": 12.0,
"unlimited": true "unlimited": false
}, },
"goalEndState": { "goalEndState": {
"velocity": 0, "velocity": 0,
@@ -161,7 +161,6 @@ public class RobotContainer {
new WaitUntilCommand(m_robotShooter::isShooterUpToSpeed), new WaitUntilCommand(m_robotShooter::isShooterUpToSpeed),
new InstantCommand(() -> m_robotIntake.setMode(IntakeMode.Idle), m_robotIntake), new InstantCommand(() -> m_robotIntake.setMode(IntakeMode.Idle), m_robotIntake),
new InstantCommand(()-> m_robotShooter.allowShooting(), m_robotShooter), new InstantCommand(()-> m_robotShooter.allowShooting(), m_robotShooter),
IntakeRetracted,
new WaitCommand(2.0), new WaitCommand(2.0),
new InstantCommand(() -> m_robotShooter.denyShooting(), m_robotShooter), new InstantCommand(() -> m_robotShooter.denyShooting(), m_robotShooter),
new InstantCommand(()->m_robotShooter.spinUpIdle(), m_robotShooter) new InstantCommand(()->m_robotShooter.spinUpIdle(), m_robotShooter)
@@ -35,7 +35,7 @@ public class IntakeConstants {
//squeeze constants //squeeze constants
// public static final ConfigurableDouble INTAKE_SQUEEZE_CURRENT_LOWER_THRESHOLD = new ConfigurableDouble("Intake Squeeze Current LOWER THRESHOLD", 20); // public static final ConfigurableDouble INTAKE_SQUEEZE_CURRENT_LOWER_THRESHOLD = new ConfigurableDouble("Intake Squeeze Current LOWER THRESHOLD", 20);
// public static final ConfigurableDouble INTAKE_SQUEEZE_CURRENT_UPPER_THRESHOLD = new ConfigurableDouble("Intake Squeeze Current UPPER THRESHOLD", 25); // public static final ConfigurableDouble INTAKE_SQUEEZE_CURRENT_UPPER_THRESHOLD = new ConfigurableDouble("Intake Squeeze Current UPPER THRESHOLD", 25);
public static final ConfigurableDouble ARM_SQUEEZE_PERCENT_OUTPUT = new ConfigurableDouble("Arm squeeze % output", -0.15); public static final ConfigurableDouble ARM_SQUEEZE_PERCENT_OUTPUT = new ConfigurableDouble("Arm squeeze % output", -0.2);
public static final ConfigurableDouble ARM_REDUCED_SQUEEZE_PERCENT_OUTPUT = new ConfigurableDouble("Arm reduce squeeze % output", 0.02); public static final ConfigurableDouble ARM_REDUCED_SQUEEZE_PERCENT_OUTPUT = new ConfigurableDouble("Arm reduce squeeze % output", 0.02);
@@ -56,9 +56,9 @@ public class IntakeConstants {
// public static final Angle ARM_LIMIT_UPPER = Degrees.of(-90); // public static final Angle ARM_LIMIT_UPPER = Degrees.of(-90);
public static final ConfigurableDouble ARM_LIMIT_RETRACTED = new ConfigurableDouble("Arm angle retracted", 0.); public static final ConfigurableDouble ARM_LIMIT_RETRACTED = new ConfigurableDouble("Arm angle retracted", 0.);
public static final ConfigurableDouble ARM_LIMIT_EXTENDED = new ConfigurableDouble("Arm angle extended", 1.625); //new soft limt public static final ConfigurableDouble ARM_LIMIT_EXTENDED = new ConfigurableDouble("Arm angle extended", 1.8); //new soft limt
public static final ConfigurableDouble ARM_EXTEND_PERCENT_OUTPUT = new ConfigurableDouble("Arm extend % output", 0.3); public static final ConfigurableDouble ARM_EXTEND_PERCENT_OUTPUT = new ConfigurableDouble("Arm extend % output", 0.5);
public static final ConfigurableDouble ARM_RETRACT_PERCENT_OUTPUT = new ConfigurableDouble("Arm retract % output", -0.15); public static final ConfigurableDouble ARM_RETRACT_PERCENT_OUTPUT = new ConfigurableDouble("Arm retract % output", -0.2);
public static final ConfigurableDouble ARM_AUTO_OUTPUT = new ConfigurableDouble("Arm auto output", -0.07); public static final ConfigurableDouble ARM_AUTO_OUTPUT = new ConfigurableDouble("Arm auto output", -0.07);
public static final ConfigurableDouble ARM_REVERSE_ROLLER_RANGE = new ConfigurableDouble("Arm reverse roller range", 1.17); public static final ConfigurableDouble ARM_REVERSE_ROLLER_RANGE = new ConfigurableDouble("Arm reverse roller range", 1.17);