Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
cbdf73f
first pass at coral ground state
LewisSeiden Mar 27, 2025
ea03c97
adjust mech viz to use new ee
LewisSeiden Mar 28, 2025
2e66856
adjust hp intake pose
LewisSeiden Mar 28, 2025
83366b3
add clearance for hp extension
LewisSeiden Mar 28, 2025
a6d19b9
begin trying to use ik to not have to redo setpoints (it brokey rn)
LewisSeiden Mar 28, 2025
28a2db9
fix getManipulatorPose (?)
LewisSeiden Mar 28, 2025
7296893
tune reef setpoints
LewisSeiden Mar 28, 2025
28f21ba
first pass tuning reef algae intaking
LewisSeiden Mar 29, 2025
d4e16cb
fix bindings for coral ground
LewisSeiden Mar 29, 2025
d0a94c1
use proper indexing
LewisSeiden Mar 29, 2025
b4b7ec7
import zeroing offset from cad
LewisSeiden Mar 29, 2025
6b2c2b2
make shoulder wait for wrist to not be retracted to begin clearance e…
LewisSeiden Mar 29, 2025
10d83eb
make auto use ground intake for ✨testing✨ reasons
LewisSeiden Mar 29, 2025
19e1e22
turn down shoulder + wrist speed for bring up
LewisSeiden Mar 29, 2025
607ee08
start tuning positions irl
LewisSeiden Mar 29, 2025
e3bfc09
more tuning on robot
LewisSeiden Mar 29, 2025
03a3b60
adjust l1
LewisSeiden Mar 29, 2025
f3b2f95
Merge branch 'ground-intake' of github.com:HighlanderRobotics/Reefsca…
LewisSeiden Mar 29, 2025
7e02572
adjust algae on robot
LewisSeiden Mar 29, 2025
3d92a1e
use stops for floor intake
LewisSeiden Mar 30, 2025
67b4183
ground intake tuning
LewisSeiden Mar 30, 2025
1863c23
tune hp pose
LewisSeiden Mar 30, 2025
37b458f
more adjustments for new ee robustness
LewisSeiden Mar 30, 2025
4715007
adjust l2 and l3 setpoints
LewisSeiden Mar 30, 2025
8f83f7d
adjust setpoints, clearance extension
LewisSeiden Mar 30, 2025
b22061b
fix not retracting after l2/3 scoring
LewisSeiden Mar 30, 2025
1c14742
reenable current limits, adjust l4 pose
LewisSeiden Mar 30, 2025
ed037bc
tune barge shot
LewisSeiden Mar 30, 2025
a2a8f16
tune stack intake, fix ik at max extension (?)
LewisSeiden Mar 30, 2025
20fa562
update ratio
LewisSeiden Mar 30, 2025
3477e2f
run spotless
Lyssia-Seiden Mar 30, 2025
385f718
update more setpoints
LewisSeiden Mar 31, 2025
af86ef0
make wrist use hardstop for ground, reenable left bumper align controls
LewisSeiden Mar 31, 2025
7c2dd02
make ready coral use hp pose, wrist use pid before hardstop
LewisSeiden Mar 31, 2025
8baa4a7
adjust wrist zero offset with shims
LewisSeiden Mar 31, 2025
824790d
Merge branch 'ground-intake' of github.com:HighlanderRobotics/Reefsca…
LewisSeiden Mar 31, 2025
6738f79
redo zeroing offset
LewisSeiden Apr 2, 2025
2428fde
increase manipulator current limit
LewisSeiden Apr 2, 2025
9cf7b35
increase wrist accel and add soft limit to try to avoid catching it
LewisSeiden Apr 2, 2025
5e8533b
revert accel increase
LewisSeiden Apr 2, 2025
012b434
adjust tucked clearance shoulder pose, increase filtering for ik
LewisSeiden Apr 2, 2025
dae0be7
try to avoid jitters when starting extendWithClearance near target
LewisSeiden Apr 2, 2025
1e59a92
hardcode auto prescore to true because it wasnt working otherwise for…
LewisSeiden Apr 3, 2025
78695e2
move auto prescore condition to Robot instead of goofy ah binding
LewisSeiden Apr 3, 2025
9f4142c
abstract checking for tuck
LewisSeiden Apr 3, 2025
ea6ed26
adjust climb so it works 🔥🔥
LewisSeiden Apr 3, 2025
6f807d9
wait better for reextension
LewisSeiden Apr 3, 2025
06d5a8c
make sure that robot waits to retract after coral score
LewisSeiden Apr 3, 2025
e289799
tune processor a bit
LewisSeiden Apr 3, 2025
869c96a
try to improve funnel behavior
LewisSeiden Apr 3, 2025
0a59d47
reenable ground piece in auto
LewisSeiden Apr 3, 2025
6265e85
turn off ik by default and when in l1
LewisSeiden Apr 3, 2025
eaa7ec4
make ground intake traj wait for prev scoring
LewisSeiden Apr 3, 2025
5c97978
try to avoid slams when entering score_coral when alr extended
LewisSeiden Apr 3, 2025
3135881
fix hop when switching from clearance to ik hold
LewisSeiden Apr 4, 2025
368665b
allow cancelling out of l4
LewisSeiden Apr 4, 2025
e1ba93a
delay wrist movement in some cases
LewisSeiden Apr 4, 2025
911d373
try to avoid l4 fucking itself again
LewisSeiden Apr 4, 2025
72dbd07
reduce skipping steps elevator tolerance
LewisSeiden Apr 4, 2025
58a5411
try to avoid l1 killing itself
LewisSeiden Apr 4, 2025
cff7bbc
tune hp intake more again 😭
LewisSeiden Apr 4, 2025
7907345
add manual zeroing
LewisSeiden Apr 4, 2025
00befae
tune auto to be slower and smoother
LewisSeiden Apr 4, 2025
91bcb2d
speed up auto a smidge
LewisSeiden Apr 4, 2025
1e8fe68
mirror lhs auto changes to rhs
LewisSeiden Apr 4, 2025
d6678fe
adjust slow speed again
LewisSeiden Apr 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@
"edu.wpi.first.math.**.struct.*",
],
"java.compile.nullAnalysis.mode": "automatic",
"java.debug.settings.onBuildFailureProceed": true
"java.debug.settings.onBuildFailureProceed": true,
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable"
}
132 changes: 67 additions & 65 deletions src/main/deploy/choreo/LOtoJ.traj

Large diffs are not rendered by default.

144 changes: 144 additions & 0 deletions src/main/deploy/choreo/LtoAGround.traj

Large diffs are not rendered by default.

118 changes: 59 additions & 59 deletions src/main/deploy/choreo/PLOtoK.traj

Large diffs are not rendered by default.

118 changes: 60 additions & 58 deletions src/main/deploy/choreo/PLOtoL.traj

Large diffs are not rendered by default.

142 changes: 71 additions & 71 deletions src/main/deploy/choreo/PRMtoB.traj

Large diffs are not rendered by default.

109 changes: 55 additions & 54 deletions src/main/deploy/choreo/PROtoC.traj

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions src/main/deploy/choreo/PROtoD.traj

Large diffs are not rendered by default.

111 changes: 55 additions & 56 deletions src/main/deploy/choreo/ROtoE.traj

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion src/main/deploy/choreo/choreo.chor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
"version":1,
"type":"Swerve",
"variables":{
"expressions":{},
"expressions":{
"slow":{
"dimension":"LinVel",
"var":{
"exp":"1.25 m / s",
"val":1.25
}
}
},
"poses":{
"A":{
"x":{
Expand Down
23 changes: 20 additions & 3 deletions src/main/java/frc/robot/Autos.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Optional;
import java.util.function.Supplier;
import org.littletonrobotics.junction.AutoLogOutput;
import org.littletonrobotics.junction.Logger;

public class Autos {
Expand All @@ -35,8 +36,9 @@ public class Autos {
private final FunnelSubsystem funnel;
private final AutoFactory factory;

public static boolean autoPreScore = false;
public static boolean autoScore = false; // TODO perhaps this should not be static
@AutoLogOutput public static boolean autoPreScore = true;
@AutoLogOutput public static boolean autoScore = false; // TODO perhaps this should not be static
@AutoLogOutput public static boolean autoGroundIntake = false;

public Autos(SwerveSubsystem swerve, ManipulatorSubsystem manipulator, FunnelSubsystem funnel) {
this.swerve = swerve;
Expand Down Expand Up @@ -141,6 +143,7 @@ public void runPath(
public Command LOtoJ() {
final var routine = factory.newRoutine("LO to J");
bindElevatorExtension(routine);
routine.active().onTrue(Commands.print("Auto!"));
HashMap<String, AutoTrajectory> steps =
new HashMap<String, AutoTrajectory>(); // key - name of path, value - traj
String[] stops = {
Expand All @@ -164,11 +167,25 @@ public Command LOtoJ() {
runPath(routine, startPos, endPos, nextPos, steps);
}

// final var groundTraj = routine.trajectory("LtoAGround");

// routine
// .observe(steps.get("PLOtoL").recentlyDone())
// .onTrue(scoreInAuto(() -> steps.get("PLOtoL").getFinalPose().get()))
// .and(() -> !manipulator.getSecondBeambreak() && !manipulator.getFirstBeambreak())
// .onTrue(Commands.runOnce(() -> Robot.setCurrentTarget(ReefTarget.L2)))
// .onTrue(groundTraj.cmd().andThen(scoreInAuto(() -> groundTraj.getFinalPose().get())))
// .onTrue(Commands.runOnce(() -> autoGroundIntake = true));

// routine
// .observe(groundTraj.done())
// .onTrue(Commands.runOnce(() -> autoGroundIntake = false).ignoringDisable(true));

routine
.observe(steps.get("LtoPLM").done())
.onTrue(Commands.runOnce(() -> Robot.setCurrentTarget(ReefTarget.L2)));

return routine.cmd();
return routine.cmd().alongWith(Commands.print("auto :("));
}

public Command ROtoE() {
Expand Down
Loading