Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 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
1693fff
make shoulder manual zero ignore disasble
LewisSeiden Apr 4, 2025
a0af068
make shoulder manual zero ignore disasble
LewisSeiden Apr 4, 2025
650c6f8
make leds orange when not zeroed
LewisSeiden Apr 4, 2025
b092e4d
make anti jam hold position and spit coral
LewisSeiden Apr 4, 2025
d53cb0c
make wrist assume starting pose if not alr zeroed
LewisSeiden Apr 5, 2025
e12eae3
merge remote formatting commit
LewisSeiden Apr 5, 2025
fa2e20d
adjsut l4 pose
LewisSeiden Apr 5, 2025
0add364
adjust hp pose
LewisSeiden Apr 5, 2025
84b024a
Update at 'Sat Apr 05 08:23:17 PDT 2025'
LewisSeiden Apr 5, 2025
1e1c16c
Update at 'Sat Apr 05 08:26:26 PDT 2025'
LewisSeiden Apr 5, 2025
a73f7ae
Update at 'Sat Apr 05 08:35:03 PDT 2025'
LewisSeiden Apr 5, 2025
e2771af
Update at 'Sat Apr 05 08:38:02 PDT 2025'
LewisSeiden Apr 5, 2025
115d9cf
Update at 'Sat Apr 05 08:41:38 PDT 2025'
LewisSeiden Apr 5, 2025
1fde829
Update at 'Sat Apr 05 09:05:42 PDT 2025'
LewisSeiden Apr 5, 2025
4f43c35
Update at 'Sat Apr 05 09:12:29 PDT 2025'
LewisSeiden Apr 5, 2025
3dc3042
Update at 'Sat Apr 05 09:12:58 PDT 2025'
LewisSeiden Apr 5, 2025
4d51253
make ground intake position reset happen sooner
LewisSeiden Apr 5, 2025
de0def1
increase climb pos
LewisSeiden Apr 5, 2025
6b0d604
Update at 'Sat Apr 05 11:08:53 PDT 2025'
LewisSeiden Apr 5, 2025
af12c89
fmt
LewisSeiden Apr 5, 2025
aff0805
Update at 'Sat Apr 05 11:15:37 PDT 2025'
LewisSeiden Apr 5, 2025
f4f2795
Update at 'Sat Apr 05 11:35:25 PDT 2025'
LewisSeiden Apr 5, 2025
cdcc9b0
Update at 'Sat Apr 05 11:36:50 PDT 2025'
LewisSeiden Apr 5, 2025
2964013
Update at 'Sat Apr 05 11:38:49 PDT 2025'
LewisSeiden Apr 5, 2025
b4100e2
Update at 'Sat Apr 05 11:40:53 PDT 2025'
LewisSeiden Apr 5, 2025
3489b3d
Update at 'Sat Apr 05 11:42:24 PDT 2025'
LewisSeiden Apr 5, 2025
5ba975a
Update at 'Sat Apr 05 11:45:58 PDT 2025'
LewisSeiden Apr 5, 2025
edfe782
make manipulator hold reset if moved too far
LewisSeiden Apr 5, 2025
b44bc93
adjust l4
LewisSeiden Apr 5, 2025
8103438
Update at 'Sat Apr 05 12:45:41 PDT 2025'
LewisSeiden Apr 5, 2025
5d36229
Update at 'Sat Apr 05 12:49:50 PDT 2025'
LewisSeiden Apr 5, 2025
00b1450
Update at 'Sat Apr 05 12:50:13 PDT 2025'
LewisSeiden Apr 5, 2025
35f9ab2
Update at 'Sat Apr 05 12:53:47 PDT 2025'
LewisSeiden Apr 5, 2025
d8926d7
Update at 'Sat Apr 05 12:55:39 PDT 2025'
LewisSeiden Apr 5, 2025
76cff1d
Update at 'Sat Apr 05 12:57:23 PDT 2025'
LewisSeiden Apr 5, 2025
fa850bd
Update at 'Sat Apr 05 13:04:25 PDT 2025'
LewisSeiden Apr 5, 2025
7ef6581
Update at 'Sat Apr 05 13:06:34 PDT 2025'
LewisSeiden Apr 5, 2025
9dd2ba1
Update at 'Sat Apr 05 13:12:36 PDT 2025'
LewisSeiden Apr 5, 2025
d77f794
Update at 'Sat Apr 05 13:12:49 PDT 2025'
LewisSeiden Apr 5, 2025
21711ea
Update at 'Sat Apr 05 13:28:17 PDT 2025'
LewisSeiden Apr 5, 2025
94120b9
Update at 'Sat Apr 05 13:33:08 PDT 2025'
LewisSeiden Apr 5, 2025
4ed1c23
Revert "Update at 'Sat Apr 05 13:33:08 PDT 2025'"
LewisSeiden Apr 5, 2025
b927795
Revert "Update at 'Sat Apr 05 13:28:17 PDT 2025'"
LewisSeiden Apr 5, 2025
d36308f
Revert "Update at 'Sat Apr 05 13:12:49 PDT 2025'"
LewisSeiden Apr 5, 2025
81c6cb1
Revert "Update at 'Sat Apr 05 13:12:36 PDT 2025'"
LewisSeiden Apr 5, 2025
13b3421
Revert "Update at 'Sat Apr 05 13:06:34 PDT 2025'"
LewisSeiden Apr 5, 2025
c75a919
Revert "Update at 'Sat Apr 05 13:04:25 PDT 2025'"
LewisSeiden Apr 5, 2025
b515a23
adjust hp pose again
LewisSeiden Apr 5, 2025
f947359
decrease funnel vel
LewisSeiden Apr 5, 2025
3ebe8a4
slow funnel more
LewisSeiden Apr 5, 2025
dc69d5e
slow down reverse indexing
LewisSeiden Apr 5, 2025
517a6e4
make IDLE wait for zero to go to READY_CORAL
LewisSeiden Apr 5, 2025
9b16223
increase rev indexing speed again
LewisSeiden Apr 5, 2025
8f057e3
make manipulator never stop in SCORE_CORAL
LewisSeiden Apr 6, 2025
c6d3d57
adjust how we wait for hitting target to outtake for SCORE_CORAL
LewisSeiden Apr 6, 2025
8adc89f
timeout shoulder hold in final stage of clearance extend
LewisSeiden Apr 6, 2025
7453743
tune operator jog
LewisSeiden Apr 6, 2025
c14703c
adjust processor height to slam less
LewisSeiden Apr 6, 2025
b751f01
use proper slow barge shot
LewisSeiden Apr 6, 2025
57d9573
reduce net shoulder vel a bit
LewisSeiden Apr 6, 2025
463147a
Start tuning
SCool62 Apr 8, 2025
b8c9368
Tune at loom
SCool62 Apr 8, 2025
6d3e9d6
Merge branch 'main' into barge-tuning
SCool62 Apr 8, 2025
13995fe
make it build
SCool62 Apr 8, 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
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ public Robot() {
AutoAim.approachAlgae(
swerve,
() -> AlgaeIntakeTargets.getClosestTargetPose(swerve.getPose()),
0.75)),
1)),
Commands.waitUntil(
new Trigger(
() ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class ExtensionKinematics {
public static final Pose2d L3_POSE = solveFK(L3_EXTENSION);
public static final Pose2d L4_POSE =
new Pose2d(new Translation2d(0.23, 2.05), Rotation2d.fromDegrees(110.0));

public static final ExtensionState L4_EXTENSION = solveIK(L4_POSE);

public static final ExtensionState LOW_ALGAE_EXTENSION =
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/frc/robot/subsystems/Superstructure.java
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,11 @@ private void configureStateTransitionCommands() {
.whileTrue(
Commands.parallel(
elevator.setExtensionSlow(ElevatorSubsystem.ALGAE_NET_EXTENSION),
shoulder.setTargetAngle(ShoulderSubsystem.SHOULDER_PRE_NET_POS),
// Make it initially extend to the full 90 degrees
shoulder.setTargetAngle(ShoulderSubsystem.SHOULDER_SHOOT_NET_POS),
wrist.setSlowTargetAngle(WristSubsystem.WRIST_SHOOT_NET_POS)))
.and(() -> wrist.isNearAngle(WristSubsystem.WRIST_SHOOT_NET_POS))
.and(() -> shoulder.isNearAngle(ShoulderSubsystem.SHOULDER_PRE_NET_POS))
.and(() -> shoulder.isNearAngle(ShoulderSubsystem.SHOULDER_SHOOT_NET_POS))
.and(() -> elevator.isNearExtension(ElevatorSubsystem.ALGAE_NET_EXTENSION))
.and(scoreReq)
.onTrue(forceState(SuperState.SCORE_ALGAE_NET));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public class ElevatorSubsystem extends SubsystemBase {
public static final double INTAKE_ALGAE_LOW_EXTENSION = Units.inchesToMeters(20.0);
public static final double INTAKE_ALGAE_HIGH_EXTENSION = Units.inchesToMeters(35.0);

public static final double ALGAE_NET_EXTENSION = Units.inchesToMeters(61.5);
// 1 inch high (maybe not needed?)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the elevator is already maxed out i believe

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was close, but the max in code was 2 inches higher

public static final double ALGAE_NET_EXTENSION = Units.inchesToMeters(62.5);

public static final double ALGAE_PROCESSOR_EXTENSION = 0.01;

public static final double HP_EXTENSION_METERS = Units.inchesToMeters(0.0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class WristSubsystem extends SubsystemBase {
public static final Rotation2d WRIST_INTAKE_ALGAE_REEF_POS = Rotation2d.fromDegrees(-20.0);
public static final Rotation2d WRIST_INTAKE_ALGAE_REEF_RETRACT_POS =
Rotation2d.fromDegrees(-20.0);

public static final Rotation2d WRIST_SHOOT_NET_POS = Rotation2d.fromDegrees(105);
public static final Rotation2d WRIST_SCORE_PROCESSOR_POS = Rotation2d.fromDegrees(-30.0);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import edu.wpi.first.math.geometry.Pose2d;
import edu.wpi.first.math.geometry.Rotation2d;
import edu.wpi.first.math.geometry.Transform2d;
import edu.wpi.first.math.util.Units;
import frc.robot.Robot;
import frc.robot.Robot.AlgaeIntakeTarget;
import java.util.Arrays;
Expand Down Expand Up @@ -55,7 +56,8 @@ public static Pose2d getRobotTargetLocation(Pose2d original) {
}

public static Pose2d getOffsetLocation(Pose2d original) {
return original.transformBy(new Transform2d((-0.3), 0, Rotation2d.kZero));
return original.transformBy(
new Transform2d((-0.3 - Units.inchesToMeters(6)), 0, Rotation2d.kZero));
}

/** Gets the closest offset target to the given pose. */
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/utils/autoaim/AutoAim.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class AutoAim {
new Translation2d(Units.inchesToMeters(176.746), Units.inchesToMeters(158.501));
public static final Translation2d RED_REEF_CENTER = ChoreoAllianceFlipUtil.flip(BLUE_REEF_CENTER);

public static double BLUE_NET_X = 8.08;
public static double BLUE_NET_X = 8.08 + Units.inchesToMeters(4);
public static double RED_NET_X = ChoreoAllianceFlipUtil.flipX(BLUE_NET_X);

public static Pose2d BLUE_PROCESSOR_POS = new Pose2d(5.973, 0, Rotation2d.fromDegrees(270));
Expand Down