From 364c270b3bd23847344228c7338d6d2a62c409de Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 26 Sep 2026 14:12:05 -0700 Subject: [PATCH 01/22] created right trench auto --- .../pathplanner/autos/OneLoopRightAuto.auto | 50 +++++ .../autos/OneLoopRightTrenchAuto.auto | 50 +++++ .../paths/RightTrenchMid-MiddlePath.path | 92 +++++++++ .../pathplanner/paths/RightTrenchMidPath.path | 179 ++++++++++++++++++ .../pathplanner/OneLoopRightTrenchAuto.java | 21 ++ .../OperatorCommandMap.java | 4 + 6 files changed, 396 insertions(+) create mode 100644 src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto create mode 100644 src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto create mode 100644 src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path create mode 100644 src/main/deploy/pathplanner/paths/RightTrenchMidPath.path create mode 100644 src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto new file mode 100644 index 00000000..2cb5791e --- /dev/null +++ b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto @@ -0,0 +1,50 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "FirstLoopRightAuto" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 5.5 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "Second-MidLoopTransition" + } + }, + { + "type": "path", + "data": { + "pathName": "SecondMidLoopCollection" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto new file mode 100644 index 00000000..e39ff571 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -0,0 +1,50 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "RightTrenchMidPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 5.5 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "RightTrenchMid-MiddlePath" + } + }, + { + "type": "path", + "data": { + "pathName": "SecondMidLoopCollection" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path new file mode 100644 index 00000000..23899924 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path @@ -0,0 +1,92 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 2.621, + "y": 1.017 + }, + "prevControl": null, + "nextControl": { + "x": 3.041032028469752, + "y": 0.6727520759193351 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.3650177935943075, + "y": 0.5974377224199281 + }, + "prevControl": { + "x": 5.0142633556343466, + "y": 0.5389180072086583 + }, + "nextControl": { + "x": 5.611609357536815, + "y": 0.6385789498249095 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.13, + "y": 1.0278054567022525 + }, + "prevControl": { + "x": 6.090487698933909, + "y": 0.7885405763693415 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.5, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 0.976909413854352, + "rotationDegrees": 7.308642542537996 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.15748031496063172, + "endWaypointRelativePos": null, + "command": null + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.102362204724392, + "endWaypointRelativePos": null, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 2.5, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 68.854 + }, + "reversed": false, + "folder": "GirlsGen Autos", + "idealStartingState": { + "velocity": 0, + "rotation": -126.67399999999999 + }, + "useDefaultConstraints": true +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path new file mode 100644 index 00000000..e1b3f6ae --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -0,0 +1,179 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.589750889679717, + "y": 0.6297153024911029 + }, + "prevControl": null, + "nextControl": { + "x": 3.9192429813270957, + "y": 0.6640605005282013 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6244483985765115, + "y": 1.264507710557533 + }, + "prevControl": { + "x": 6.721026460008028, + "y": 0.525485769629431 + }, + "nextControl": { + "x": 8.20093710702937, + "y": 1.7360900200585012 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 3.2872360616844607 + }, + "prevControl": { + "x": 7.4421179179978605, + "y": 3.5352179109232558 + }, + "nextControl": { + "x": 7.609987980042246, + "y": 2.2220822810583636 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.010569395017794, + "y": 0.6297153024911029 + }, + "prevControl": { + "x": 6.33744246649674, + "y": 0.559068531939399 + }, + "nextControl": { + "x": 5.766211455473818, + "y": 0.6825281549213842 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 2.6214234875391043, + "y": 1.017046263345195 + }, + "prevControl": { + "x": 3.7511387900302076, + "y": 0.4468090154211144 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.42628774422735244, + "rotationDegrees": 0.10827321613598044 + }, + { + "waypointRelativePos": 0.5, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 1.0284191829484794, + "rotationDegrees": 87.7606727006398 + }, + { + "waypointRelativePos": 1.420959147424509, + "rotationDegrees": 96.78976433613241 + }, + { + "waypointRelativePos": 2.749555950266447, + "rotationDegrees": -179.0040765647882 + }, + { + "waypointRelativePos": 3.744227353463606, + "rotationDegrees": 178.97451694025509 + } + ], + "constraintZones": [ + { + "name": "Collecting Speed Constraint", + "minWaypointRelativePos": 1.2238470191225992, + "maxWaypointRelativePos": 1.7367829021372558, + "constraints": { + "maxVelocity": 2.1, + "maxAcceleration": 4.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "Constraints Zone", + "minWaypointRelativePos": 3.7525309336333033, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 2.0, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.4499437570303522, + "endWaypointRelativePos": null, + "command": null + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.584926884139489, + "endWaypointRelativePos": 2.3, + "command": null + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.32058492688417, + "endWaypointRelativePos": 4.0, + "command": null + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.7345331833520894, + "endWaypointRelativePos": 4.0, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 2.5, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -126.67434966957315 + }, + "reversed": false, + "folder": "GirlsGen Autos", + "idealStartingState": { + "velocity": 0, + "rotation": 0.0 + }, + "useDefaultConstraints": true +} \ No newline at end of file diff --git a/src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java b/src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java new file mode 100644 index 00000000..c22bef43 --- /dev/null +++ b/src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java @@ -0,0 +1,21 @@ +package competition.auto.pathplanner; + +import com.pathplanner.lib.auto.AutoBuilder; +import competition.auto.BaseAutonomousSequentialCommandGroup; +import xbot.common.properties.PropertyFactory; +import xbot.common.subsystems.autonomous.AutonomousCommandSelector; + +import javax.inject.Inject; + +public class OneLoopRightTrenchAuto extends BaseAutonomousSequentialCommandGroup { + @Inject + public OneLoopRightTrenchAuto( + AutonomousCommandSelector autoSelector, + PropertyFactory pf + ) { + super(autoSelector); + pf.setPrefix(this.getName()); + + this.addCommands(AutoBuilder.buildAuto("OneLoopRightTrenchAuto")); + } +} diff --git a/src/main/java/competition/operator_interface/OperatorCommandMap.java b/src/main/java/competition/operator_interface/OperatorCommandMap.java index 189fe07b..23b77909 100644 --- a/src/main/java/competition/operator_interface/OperatorCommandMap.java +++ b/src/main/java/competition/operator_interface/OperatorCommandMap.java @@ -217,6 +217,10 @@ public void setupAutoCommands(Provider setAutonomousComman var normalBumpAutoRight = setAutonomousCommandProvider.get(); normalBumpAutoRight.setAutoCommand(AutoBuilder.buildAuto("NormalBumpAutoRight")); normalBumpAutoRight.includeOnSmartDashboard("Normal Bump Auto Right"); + + var oneLoopRightTrenchAuto = setAutonomousCommandProvider.get(); + oneLoopRightTrenchAuto.setAutoCommand(AutoBuilder.buildAuto("OneLoopRightTrenchAuto")); + oneLoopRightTrenchAuto.includeOnSmartDashboard("One Loop Right Trench Auto"); } @Inject From e60f0ba3593b8ecdeb4936324f81803451a087c3 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 26 Sep 2026 14:19:35 -0700 Subject: [PATCH 02/22] add path (will cause merge conflicts) --- .../paths/SecondMidLoopCollection.path | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path diff --git a/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path b/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path new file mode 100644 index 00000000..b3cc33ff --- /dev/null +++ b/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path @@ -0,0 +1,66 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 7.13, + "y": 1.028 + }, + "prevControl": null, + "nextControl": { + "x": 7.775077105570398, + "y": 1.9100593119736207 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.581411625150304, + "y": 3.308754448399775 + }, + "prevControl": { + "x": 7.871909845783922, + "y": 3.8144365361729076 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.3712255772646537, + "rotationDegrees": 83.20016274988633 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "CollectorIntake", + "waypointRelativePos": 0, + "endWaypointRelativePos": 1.0, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 2.5, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 87.39743779770183 + }, + "reversed": false, + "folder": "GirlsGen Autos", + "idealStartingState": { + "velocity": 0, + "rotation": 68.854 + }, + "useDefaultConstraints": true +} \ No newline at end of file From ca895ef87e9c3863a79967ffe15d2eef0d460769 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 14:15:22 -0700 Subject: [PATCH 03/22] fixes for auto hitting trench --- src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto | 4 ++-- src/main/deploy/pathplanner/paths/RightTrenchMidPath.path | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto index 2cb5791e..e39ff571 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto @@ -7,7 +7,7 @@ { "type": "path", "data": { - "pathName": "FirstLoopRightAuto" + "pathName": "RightTrenchMidPath" } }, { @@ -32,7 +32,7 @@ { "type": "path", "data": { - "pathName": "Second-MidLoopTransition" + "pathName": "RightTrenchMid-MiddlePath" } }, { diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index e1b3f6ae..96d3c6c6 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -48,15 +48,15 @@ }, { "anchor": { - "x": 6.010569395017794, + "x": 6.699157769869515, "y": 0.6297153024911029 }, "prevControl": { - "x": 6.33744246649674, + "x": 7.026030841348462, "y": 0.559068531939399 }, "nextControl": { - "x": 5.766211455473818, + "x": 6.454799830325539, "y": 0.6825281549213842 }, "isLocked": false, @@ -170,7 +170,7 @@ "rotation": -126.67434966957315 }, "reversed": false, - "folder": "GirlsGen Autos", + "folder": null, "idealStartingState": { "velocity": 0, "rotation": 0.0 From 7905dc3614c2511849403be5e3018f5d8afef5c6 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 16:07:10 -0700 Subject: [PATCH 04/22] continue editing pathplanner auto --- .../pathplanner/autos/OneLoopRightAuto.auto | 2 +- .../paths/RightTrenchMid-MiddlePath.path | 6 +++--- .../pathplanner/paths/RightTrenchMidPath.path | 16 ++++++++-------- .../paths/SecondMidLoopCollection.path | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto index e39ff571..813c901e 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 5.5 + "waitTime": 4.5 } }, { diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path index 23899924..253902c0 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path @@ -59,13 +59,13 @@ "eventMarkers": [ { "name": "IntakeDeployRetract", - "waypointRelativePos": 0.15748031496063172, + "waypointRelativePos": 0.22947131608548418, "endWaypointRelativePos": null, "command": null }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 1.102362204724392, + "waypointRelativePos": 1.5613048368954145, "endWaypointRelativePos": null, "command": null } @@ -83,7 +83,7 @@ "rotation": 68.854 }, "reversed": false, - "folder": "GirlsGen Autos", + "folder": null, "idealStartingState": { "velocity": 0, "rotation": -126.67399999999999 diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 96d3c6c6..68e68812 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -133,21 +133,21 @@ "pointTowardsZones": [], "eventMarkers": [ { - "name": "IntakeDeployExtend", - "waypointRelativePos": 0.4499437570303522, - "endWaypointRelativePos": null, + "name": "CollectorIntake", + "waypointRelativePos": 0.584926884139489, + "endWaypointRelativePos": 2.600674915635537, "command": null }, { - "name": "CollectorIntake", - "waypointRelativePos": 0.584926884139489, - "endWaypointRelativePos": 2.3, + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.7199100112486057, + "endWaypointRelativePos": null, "command": null }, { "name": "WarmupShooterNear", - "waypointRelativePos": 3.32058492688417, - "endWaypointRelativePos": 4.0, + "waypointRelativePos": 3.6175478065242364, + "endWaypointRelativePos": 3.986501687289095, "command": null }, { diff --git a/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path b/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path index b3cc33ff..eb6003d2 100644 --- a/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path +++ b/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 7.775077105570398, - "y": 1.9100593119736207 + "x": 8.194928220384199, + "y": 1.2731142333684473 }, "isLocked": false, "linkedName": null @@ -39,8 +39,8 @@ "eventMarkers": [ { "name": "CollectorIntake", - "waypointRelativePos": 0, - "endWaypointRelativePos": 1.0, + "waypointRelativePos": 0.008998875140608063, + "endWaypointRelativePos": 0.9898762654668166, "command": null } ], @@ -57,7 +57,7 @@ "rotation": 87.39743779770183 }, "reversed": false, - "folder": "GirlsGen Autos", + "folder": null, "idealStartingState": { "velocity": 0, "rotation": 68.854 From 239cd4bb5f1bb8c6951780d8894b34bd556761fa Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 18:22:00 -0700 Subject: [PATCH 05/22] attempt two cycles --- .../pathplanner/autos/OneLoopRightAuto.auto | 50 ------- .../autos/OneLoopRightTrenchAuto.auto | 19 ++- .../paths/RightTrenchMid-MiddlePath.path | 129 +++++++++++++++--- .../pathplanner/paths/RightTrenchMidPath.path | 71 +++++----- .../paths/SecondMidLoopCollection.path | 66 --------- 5 files changed, 163 insertions(+), 172 deletions(-) delete mode 100644 src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto delete mode 100644 src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto deleted file mode 100644 index 813c901e..00000000 --- a/src/main/deploy/pathplanner/autos/OneLoopRightAuto.auto +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "2025.0", - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "RightTrenchMidPath" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 4.5 - } - }, - { - "type": "named", - "data": { - "name": "AimAndShootFromHere" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "RightTrenchMid-MiddlePath" - } - }, - { - "type": "path", - "data": { - "pathName": "SecondMidLoopCollection" - } - } - ] - } - }, - "resetOdom": true, - "folder": null, - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto index e39ff571..22aee435 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 5.5 + "waitTime": 4.0 } }, { @@ -36,9 +36,22 @@ } }, { - "type": "path", + "type": "deadline", "data": { - "pathName": "SecondMidLoopCollection" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 4.0 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path index 253902c0..383ea862 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 3.041032028469752, - "y": 0.6727520759193351 + "x": 2.965717674970344, + "y": 0.4898457888493476 }, "isLocked": false, "linkedName": null @@ -20,24 +20,56 @@ "y": 0.5974377224199281 }, "prevControl": { - "x": 5.0142633556343466, - "y": 0.5389180072086583 + "x": 5.027900002678282, + "y": 0.7105961417483841 }, "nextControl": { - "x": 5.611609357536815, - "y": 0.6385789498249095 + "x": 6.903582443653619, + "y": 0.08099644128113825 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.13, - "y": 1.0278054567022525 + "x": 7.914946619217083, + "y": 3.2764768683274017 }, "prevControl": { - "x": 6.090487698933909, - "y": 0.7885405763693415 + "x": 7.959847672590897, + "y": 3.030542130224136 + }, + "nextControl": { + "x": 7.7220516939231825, + "y": 4.333012503219032 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.9890510083036785, + "y": 2.587888493475682 + }, + "prevControl": { + "x": 8.571257413997628, + "y": 2.297390272835112 + }, + "nextControl": { + "x": 5.307038195637055, + "y": 2.6646149349006776 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 2.815088967971531, + "y": 2.587888493475682 + }, + "prevControl": { + "x": 3.837212336892053, + "y": 2.3511862396204037 }, "nextControl": null, "isLocked": false, @@ -46,12 +78,24 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.5, - "rotationDegrees": 0.0 + "waypointRelativePos": 1.321492007104796, + "rotationDegrees": -159.34367527546624 + }, + { + "waypointRelativePos": 1.433392539964479, + "rotationDegrees": 38.54310882017101 + }, + { + "waypointRelativePos": 1.7850799289520412, + "rotationDegrees": 83.67481843688257 }, { - "waypointRelativePos": 0.976909413854352, - "rotationDegrees": 7.308642542537996 + "waypointRelativePos": 3.1, + "rotationDegrees": -130.24 + }, + { + "waypointRelativePos": 3.65, + "rotationDegrees": -130.24082409794818 } ], "constraintZones": [], @@ -61,18 +105,61 @@ "name": "IntakeDeployRetract", "waypointRelativePos": 0.22947131608548418, "endWaypointRelativePos": null, - "command": null + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 1.5613048368954145, + "waypointRelativePos": 1.2688413948256476, "endWaypointRelativePos": null, - "command": null + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.403824521934759, + "endWaypointRelativePos": 2.87064116985378, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.779527559055119, + "endWaypointRelativePos": 3.99, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.79, + "endWaypointRelativePos": 4, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -80,7 +167,7 @@ }, "goalEndState": { "velocity": 0, - "rotation": 68.854 + "rotation": -137.72631099390622 }, "reversed": false, "folder": null, @@ -88,5 +175,5 @@ "velocity": 0, "rotation": -126.67399999999999 }, - "useDefaultConstraints": true + "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 68e68812..96918594 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -48,16 +48,16 @@ }, { "anchor": { - "x": 6.699157769869515, + "x": 6.376381969157771, "y": 0.6297153024911029 }, "prevControl": { - "x": 7.026030841348462, - "y": 0.559068531939399 + "x": 6.681979147837411, + "y": 0.7655362707931648 }, "nextControl": { - "x": 6.454799830325539, - "y": 0.6825281549213842 + "x": 6.085883748517201, + "y": 0.5006049822064051 }, "isLocked": false, "linkedName": null @@ -108,58 +108,65 @@ "minWaypointRelativePos": 1.2238470191225992, "maxWaypointRelativePos": 1.7367829021372558, "constraints": { - "maxVelocity": 2.1, + "maxVelocity": 3.0, "maxAcceleration": 4.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, "unlimited": false } - }, - { - "name": "Constraints Zone", - "minWaypointRelativePos": 3.7525309336333033, - "maxWaypointRelativePos": 4.0, - "constraints": { - "maxVelocity": 2.0, - "maxAcceleration": 3.0, - "maxAngularVelocity": 540.0, - "maxAngularAcceleration": 720.0, - "nominalVoltage": 12.0, - "unlimited": false - } } ], "pointTowardsZones": [], "eventMarkers": [ - { - "name": "CollectorIntake", - "waypointRelativePos": 0.584926884139489, - "endWaypointRelativePos": 2.600674915635537, - "command": null - }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.7199100112486057, + "waypointRelativePos": 0.5309336332958503, "endWaypointRelativePos": null, - "command": null + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9178852643419619, + "endWaypointRelativePos": 2.3937007874015763, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } }, { "name": "WarmupShooterNear", "waypointRelativePos": 3.6175478065242364, "endWaypointRelativePos": 3.986501687289095, - "command": null + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } }, { "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", "waypointRelativePos": 3.7345331833520894, "endWaypointRelativePos": 4.0, - "command": null + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -175,5 +182,5 @@ "velocity": 0, "rotation": 0.0 }, - "useDefaultConstraints": true + "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path b/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path deleted file mode 100644 index eb6003d2..00000000 --- a/src/main/deploy/pathplanner/paths/SecondMidLoopCollection.path +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": "2025.0", - "waypoints": [ - { - "anchor": { - "x": 7.13, - "y": 1.028 - }, - "prevControl": null, - "nextControl": { - "x": 8.194928220384199, - "y": 1.2731142333684473 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 7.581411625150304, - "y": 3.308754448399775 - }, - "prevControl": { - "x": 7.871909845783922, - "y": 3.8144365361729076 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [ - { - "waypointRelativePos": 0.3712255772646537, - "rotationDegrees": 83.20016274988633 - } - ], - "constraintZones": [], - "pointTowardsZones": [], - "eventMarkers": [ - { - "name": "CollectorIntake", - "waypointRelativePos": 0.008998875140608063, - "endWaypointRelativePos": 0.9898762654668166, - "command": null - } - ], - "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, - "maxAngularVelocity": 540.0, - "maxAngularAcceleration": 720.0, - "nominalVoltage": 12.0, - "unlimited": false - }, - "goalEndState": { - "velocity": 0, - "rotation": 87.39743779770183 - }, - "reversed": false, - "folder": null, - "idealStartingState": { - "velocity": 0, - "rotation": 68.854 - }, - "useDefaultConstraints": true -} \ No newline at end of file From dbdd995c2f71e8985c7fbc342d24bedb39609981 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 19:48:39 -0700 Subject: [PATCH 06/22] more path optimizations --- .../autos/OneLoopRightTrenchAuto.auto | 6 +- .../pathplanner/paths/RightTrenchMidPath.path | 40 ++-- ...h.path => RightTrenchSecondCyclePath.path} | 6 +- .../pathplanner/paths/RightTrenchToMid.path | 98 +++++++++ .../paths/SecondRightTrenchMidPath.path | 201 ++++++++++++++++++ 5 files changed, 325 insertions(+), 26 deletions(-) rename src/main/deploy/pathplanner/paths/{RightTrenchMid-MiddlePath.path => RightTrenchSecondCyclePath.path} (96%) create mode 100644 src/main/deploy/pathplanner/paths/RightTrenchToMid.path create mode 100644 src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto index 22aee435..975d8507 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 4.0 + "waitTime": 4.25 } }, { @@ -32,7 +32,7 @@ { "type": "path", "data": { - "pathName": "RightTrenchMid-MiddlePath" + "pathName": "SecondRightTrenchMidPath" } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 4.0 + "waitTime": 4.25 } }, { diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 96918594..17181a40 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -3,13 +3,13 @@ "waypoints": [ { "anchor": { - "x": 3.589750889679717, + "x": 4.43, "y": 0.6297153024911029 }, "prevControl": null, "nextControl": { - "x": 3.9192429813270957, - "y": 0.6640605005282013 + "x": 4.679781004711073, + "y": 0.6192534821176207 }, "isLocked": false, "linkedName": null @@ -20,12 +20,12 @@ "y": 1.264507710557533 }, "prevControl": { - "x": 6.721026460008028, - "y": 0.525485769629431 + "x": 7.4523013048635836, + "y": 0.016441281138789954 }, "nextControl": { - "x": 8.20093710702937, - "y": 1.7360900200585012 + "x": 7.719388011461684, + "y": 1.9528199039750431 }, "isLocked": false, "linkedName": null @@ -36,12 +36,12 @@ "y": 3.2872360616844607 }, "prevControl": { - "x": 7.4421179179978605, - "y": 3.5352179109232558 + "x": 7.37146358665783, + "y": 3.5153220713072177 }, "nextControl": { - "x": 7.609987980042246, - "y": 2.2220822810583636 + "x": 8.04444218598517, + "y": 2.0156850598924994 }, "isLocked": false, "linkedName": null @@ -52,24 +52,24 @@ "y": 0.6297153024911029 }, "prevControl": { - "x": 6.681979147837411, - "y": 0.7655362707931648 + "x": 6.931428228300772, + "y": 0.8980082774510312 }, "nextControl": { - "x": 6.085883748517201, - "y": 0.5006049822064051 + "x": 5.819696079610017, + "y": 0.3606297786005597 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 2.6214234875391043, - "y": 1.017046263345195 + "x": 3.514436536180309, + "y": 0.823380782918149 }, "prevControl": { - "x": 3.7511387900302076, - "y": 0.4468090154211144 + "x": 5.252346583643327, + "y": 0.5105349734141064 }, "nextControl": null, "isLocked": false, @@ -174,7 +174,7 @@ }, "goalEndState": { "velocity": 0, - "rotation": -126.67434966957315 + "rotation": -101.0409401803238 }, "reversed": false, "folder": null, diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path b/src/main/deploy/pathplanner/paths/RightTrenchSecondCyclePath.path similarity index 96% rename from src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path rename to src/main/deploy/pathplanner/paths/RightTrenchSecondCyclePath.path index 383ea862..853040a8 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMid-MiddlePath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchSecondCyclePath.path @@ -78,8 +78,8 @@ ], "rotationTargets": [ { - "waypointRelativePos": 1.321492007104796, - "rotationDegrees": -159.34367527546624 + "waypointRelativePos": 0.8596802841918258, + "rotationDegrees": 0.0 }, { "waypointRelativePos": 1.433392539964479, @@ -173,7 +173,7 @@ "folder": null, "idealStartingState": { "velocity": 0, - "rotation": -126.67399999999999 + "rotation": -119.05499999999999 }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightTrenchToMid.path b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path new file mode 100644 index 00000000..51bd0724 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path @@ -0,0 +1,98 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 0.823 + }, + "prevControl": null, + "nextControl": { + "x": 4.988446026097272, + "y": 0.7050296559905087 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.644756820877818, + "y": 0.6942704626280727 + }, + "prevControl": { + "x": 5.327271327590772, + "y": 0.6069340737789655 + }, + "nextControl": { + "x": 7.386041818368763, + "y": 1.1732767380439026 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.4307829181494665, + "y": 1.1676749703440101 + }, + "prevControl": { + "x": 7.0132009298258495, + "y": 0.7817477662784769 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.4014209591474248, + "rotationDegrees": -89.9931176491535 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.1124859392575941, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.1473565804274435, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 55.58163552094366 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0.0, + "rotation": -119.05499999999999 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path new file mode 100644 index 00000000..a6a2dd2d --- /dev/null +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -0,0 +1,201 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 0.823 + }, + "prevControl": null, + "nextControl": { + "x": 3.977081850533809, + "y": 0.6081969157769855 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.602930011862398, + "y": 1.1353973902728354 + }, + "prevControl": { + "x": 7.1056243047031655, + "y": 0.20364184450722733 + }, + "nextControl": { + "x": 7.85996478920588, + "y": 1.6169795957385253 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 3.2872360616844607 + }, + "prevControl": { + "x": 7.3948579297193335, + "y": 3.5244385915281 + }, + "nextControl": { + "x": 8.063462794625597, + "y": 1.5159377464481645 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.376381969157771, + "y": 0.6297153024911029 + }, + "prevControl": { + "x": 6.748291122680355, + "y": 0.7563460568670879 + }, + "nextControl": { + "x": 5.981292268034173, + "y": 0.4951918404423913 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.514, + "y": 0.823 + }, + "prevControl": { + "x": 5.7820656534626576, + "y": 0.47407771063521864 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.42628774422735244, + "rotationDegrees": 0.10827321613598044 + }, + { + "waypointRelativePos": 0.5, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 1.0284191829484794, + "rotationDegrees": 87.7606727006398 + }, + { + "waypointRelativePos": 1.420959147424509, + "rotationDegrees": 96.78976433613241 + }, + { + "waypointRelativePos": 2.749555950266447, + "rotationDegrees": -179.0040765647882 + }, + { + "waypointRelativePos": 3.75, + "rotationDegrees": 178.97451694025509 + }, + { + "waypointRelativePos": 3.95, + "rotationDegrees": 180.0 + } + ], + "constraintZones": [ + { + "name": "Collecting Speed Constraint", + "minWaypointRelativePos": 1.340832395950507, + "maxWaypointRelativePos": 1.637795275590552, + "constraints": { + "maxVelocity": 3.5, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.1079865016872891, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.5309336332958503, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9178852643419619, + "endWaypointRelativePos": 2.3937007874015763, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.65, + "endWaypointRelativePos": 3.986501687289095, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.75, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -119.05499999999999 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": -119.05499999999999 + }, + "useDefaultConstraints": false +} \ No newline at end of file From 329c4606369bbc86e2ab78062725efc28b4969c5 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 20:14:27 -0700 Subject: [PATCH 07/22] double cycle auto! --- .../autos/OneLoopRightTrenchAuto.auto | 6 +++++ .../pathplanner/paths/RightTrenchMidPath.path | 6 ++--- .../paths/SecondRightTrenchMidPath.path | 25 +++++++++++++------ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto index 975d8507..48cdbbac 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -53,6 +53,12 @@ } ] } + }, + { + "type": "path", + "data": { + "pathName": "RightTrenchToMid" + } } ] } diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 17181a40..498a8d4b 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -48,15 +48,15 @@ }, { "anchor": { - "x": 6.376381969157771, + "x": 6.6130842230130495, "y": 0.6297153024911029 }, "prevControl": { - "x": 6.931428228300772, + "x": 7.168130482156051, "y": 0.8980082774510312 }, "nextControl": { - "x": 5.819696079610017, + "x": 6.056398333465295, "y": 0.3606297786005597 }, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path index a6a2dd2d..fecf5387 100644 --- a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -48,16 +48,16 @@ }, { "anchor": { - "x": 6.376381969157771, - "y": 0.6297153024911029 + "x": 6.2903084223013055, + "y": 0.5974377224199281 }, "prevControl": { - "x": 6.748291122680355, - "y": 0.7563460568670879 + "x": 6.662217575823889, + "y": 0.7240684767959131 }, "nextControl": { - "x": 5.981292268034173, - "y": 0.4951918404423913 + "x": 5.895218721177708, + "y": 0.4629142603712165 }, "isLocked": false, "linkedName": null @@ -125,7 +125,18 @@ "eventMarkers": [ { "name": "IntakeDeployRetract", - "waypointRelativePos": 0.1079865016872891, + "waypointRelativePos": 0.035995500562435306, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.1889763779527467, "endWaypointRelativePos": null, "command": { "type": "named", From b4a75f75cac0debf011abd6667aec3ddccfbf650 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 10 Oct 2026 20:18:52 -0700 Subject: [PATCH 08/22] quick value tweak --- src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto index 48cdbbac..4c2a8e64 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 4.25 + "waitTime": 4.15 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 4.25 + "waitTime": 4.15 } }, { From e65530eb2a6ae5ad2117d2c39bf9f4cd0c2d9eff Mon Sep 17 00:00:00 2001 From: Victor C Date: Tue, 13 Oct 2026 15:13:36 -0700 Subject: [PATCH 09/22] slightly shorter shots to give more time for 2 cycles --- .../deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto | 4 ++-- src/main/deploy/pathplanner/paths/RightTrenchMidPath.path | 4 ++-- .../deploy/pathplanner/paths/SecondRightTrenchMidPath.path | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto index 4c2a8e64..7cc3ae26 100644 --- a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto +++ b/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 4.15 + "waitTime": 3.75 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 4.15 + "waitTime": 3.75 } }, { diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 498a8d4b..64aaa6f2 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -143,7 +143,7 @@ }, { "name": "WarmupShooterNear", - "waypointRelativePos": 3.6175478065242364, + "waypointRelativePos": 3.2485939257592693, "endWaypointRelativePos": 3.986501687289095, "command": { "type": "named", @@ -154,7 +154,7 @@ }, { "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", - "waypointRelativePos": 3.7345331833520894, + "waypointRelativePos": 3.7435320584926886, "endWaypointRelativePos": 4.0, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path index fecf5387..37fd8c98 100644 --- a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -41,7 +41,7 @@ }, "nextControl": { "x": 8.063462794625597, - "y": 1.5159377464481645 + "y": 1.5159377464481647 }, "isLocked": false, "linkedName": null @@ -69,7 +69,7 @@ }, "prevControl": { "x": 5.7820656534626576, - "y": 0.47407771063521864 + "y": 0.4740777106352186 }, "nextControl": null, "isLocked": false, @@ -169,7 +169,7 @@ }, { "name": "WarmupShooterNear", - "waypointRelativePos": 3.65, + "waypointRelativePos": 3.482564679415074, "endWaypointRelativePos": 3.986501687289095, "command": { "type": "named", From ba1d1b4c7f9642633ae144029f51fb2ee0f8f06a Mon Sep 17 00:00:00 2001 From: Victor C Date: Thu, 15 Oct 2026 18:43:56 -0700 Subject: [PATCH 10/22] further optimizations, adding look at point --- .../pathplanner/paths/BumpAutoFirstPath.path | 115 ++++++++++++++++++ .../deploy/pathplanner/paths/New Path.path | 88 ++++++++++++++ .../pathplanner/paths/RightTrenchMidPath.path | 12 +- .../pathplanner/paths/RightTrenchToMid.path | 36 +++--- .../paths/SecondRightTrenchMidPath.path | 15 ++- 5 files changed, 243 insertions(+), 23 deletions(-) create mode 100644 src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path create mode 100644 src/main/deploy/pathplanner/paths/New Path.path diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path new file mode 100644 index 00000000..1f135726 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -0,0 +1,115 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.3644128113879015, + "y": 0.6189561091340454 + }, + "prevControl": null, + "nextControl": { + "x": 5.36870203753537, + "y": 0.49779418255790475 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.721281138790035, + "y": 1.651838671411625 + }, + "prevControl": { + "x": 6.732261910150816, + "y": 0.8718031076549311 + }, + "nextControl": { + "x": 7.917576046100175, + "y": 1.806655690385973 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.893428232502968, + "y": 2.7169988137603784 + }, + "prevControl": { + "x": 8.130965489993711, + "y": 2.359525232235475 + }, + "nextControl": { + "x": 6.982008731897769, + "y": 4.088608457631414 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 4.94540925266904, + "y": 2.5018149466192163 + }, + "prevControl": { + "x": 5.1947739276267235, + "y": 2.5196267091161935 + }, + "nextControl": { + "x": 3.7403795966785296, + "y": 2.415741399762752 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 2.6321826809015425, + "y": 1.2967852906287078 + }, + "prevControl": { + "x": 2.750533807829182, + "y": 2.2113167259786475 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.7833037300177648, + "rotationDegrees": 60.49320542088961 + }, + { + "waypointRelativePos": 2.8, + "rotationDegrees": -123.82264632208565 + }, + { + "waypointRelativePos": 3.45, + "rotationDegrees": -124.83241559758541 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -128.5169263071027 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 0.0 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/New Path.path b/src/main/deploy/pathplanner/paths/New Path.path new file mode 100644 index 00000000..1d472cce --- /dev/null +++ b/src/main/deploy/pathplanner/paths/New Path.path @@ -0,0 +1,88 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 2.632, + "y": 1.297 + }, + "prevControl": null, + "nextControl": { + "x": 2.6106642941874263, + "y": 0.5221233689205222 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.463060498220641, + "y": 0.9955278766310789 + }, + "prevControl": { + "x": 7.226358244365363, + "y": 0.24238434163701073 + }, + "nextControl": { + "x": 7.766096227730168, + "y": 1.9597324705250283 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.729620403321471, + "y": 2.3511862396204037 + }, + "prevControl": { + "x": 4.2061825446609, + "y": 2.1741729397609575 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 1.0 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.25, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "", + "waypointRelativePos": 0, + "endWaypointRelativePos": null, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 2.5, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 0.0 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": -128.517 + }, + "useDefaultConstraints": true +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 64aaa6f2..f7ef24f3 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -64,12 +64,12 @@ }, { "anchor": { - "x": 3.514436536180309, - "y": 0.823380782918149 + "x": 3.460640569395019, + "y": 0.7695848161274785 }, "prevControl": { - "x": 5.252346583643327, - "y": 0.5105349734141064 + "x": 5.0422419928825635, + "y": 0.45756820877279436 }, "nextControl": null, "isLocked": false, @@ -98,7 +98,7 @@ "rotationDegrees": -179.0040765647882 }, { - "waypointRelativePos": 3.744227353463606, + "waypointRelativePos": 3.95, "rotationDegrees": 178.97451694025509 } ], @@ -174,7 +174,7 @@ }, "goalEndState": { "velocity": 0, - "rotation": -101.0409401803238 + "rotation": -110.40988283380406 }, "reversed": false, "folder": null, diff --git a/src/main/deploy/pathplanner/paths/RightTrenchToMid.path b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path index 51bd0724..1b0a19a5 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchToMid.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": 4.988446026097272, - "y": 0.7050296559905087 + "x": 4.4658539826374, + "y": 0.5976940666190532 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 5.644756820877818, - "y": 0.6942704626280727 + "x": 6.2903084223013055, + "y": 0.7050296559905087 }, "prevControl": { - "x": 5.327271327590772, - "y": 0.6069340737789655 + "x": 5.954745702065148, + "y": 0.5897312460794514 }, "nextControl": { - "x": 7.386041818368763, - "y": 1.1732767380439026 + "x": 7.298432337453816, + "y": 1.0514182069254643 }, "isLocked": false, "linkedName": null @@ -36,22 +36,28 @@ "y": 1.1676749703440101 }, "prevControl": { - "x": 7.0132009298258495, - "y": 0.7817477662784769 + "x": 6.764789446774394, + "y": 0.860680171754671 }, "nextControl": null, "isLocked": false, "linkedName": null } ], - "rotationTargets": [ + "rotationTargets": [], + "constraintZones": [], + "pointTowardsZones": [ { - "waypointRelativePos": 0.4014209591474248, - "rotationDegrees": -89.9931176491535 + "fieldPosition": { + "x": 7.0, + "y": 0.75 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.4094488188976311, + "name": "Point Towards Zone" } ], - "constraintZones": [], - "pointTowardsZones": [], "eventMarkers": [ { "name": "IntakeDeployRetract", diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path index 37fd8c98..6ceeb631 100644 --- a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -69,7 +69,7 @@ }, "prevControl": { "x": 5.7820656534626576, - "y": 0.4740777106352186 + "y": 0.4740777106352185 }, "nextControl": null, "isLocked": false, @@ -121,7 +121,18 @@ } } ], - "pointTowardsZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 0.75 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.3509561304836896, + "name": "Point Towards Zone" + } + ], "eventMarkers": [ { "name": "IntakeDeployRetract", From 7c902859f383d65ff85942c590221130f0a26d47 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 17 Oct 2026 12:00:36 -0700 Subject: [PATCH 11/22] double cycle autos --- .../autos/TwoLoopRightBumpAuto.auto | 31 +++ ...hAuto.auto => TwoLoopRightTrenchAuto.auto} | 0 .../pathplanner/paths/BackUpFromHub.path | 4 +- .../pathplanner/paths/BumpAutoFirstPath.path | 49 ++++- .../pathplanner/paths/BumpAutoSecondPath.path | 178 ++++++++++++++++++ .../pathplanner/paths/DepoToTowerPath.path | 4 +- .../pathplanner/paths/FirstCycleLeft.path | 4 +- .../pathplanner/paths/FirstCycleRight.path | 4 +- .../paths/GoBackToAllianceZone.path | 4 +- .../pathplanner/paths/GoUnderTrench.path | 4 +- .../pathplanner/paths/HubToDepoPath.path | 4 +- .../deploy/pathplanner/paths/New Path.path | 88 --------- .../pathplanner/paths/ResetToTrench.path | 4 +- .../paths/RightBumpThirdCycle.path | 162 ++++++++++++++++ .../pathplanner/paths/SecondCycleLeft.path | 4 +- .../pathplanner/paths/SecondCycleRight.path | 4 +- src/main/deploy/pathplanner/settings.json | 6 +- .../pathplanner/TwoLoopRightBumpAuto.java | 21 +++ ...hAuto.java => TwoLoopRightTrenchAuto.java} | 6 +- .../OperatorCommandMap.java | 10 +- 20 files changed, 472 insertions(+), 119 deletions(-) create mode 100644 src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto rename src/main/deploy/pathplanner/autos/{OneLoopRightTrenchAuto.auto => TwoLoopRightTrenchAuto.auto} (100%) create mode 100644 src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path delete mode 100644 src/main/deploy/pathplanner/paths/New Path.path create mode 100644 src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path create mode 100644 src/main/java/competition/auto/pathplanner/TwoLoopRightBumpAuto.java rename src/main/java/competition/auto/pathplanner/{OneLoopRightTrenchAuto.java => TwoLoopRightTrenchAuto.java} (75%) diff --git a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto new file mode 100644 index 00000000..e0a508c6 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -0,0 +1,31 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "BumpAutoFirstPath" + } + }, + { + "type": "path", + "data": { + "pathName": "BumpAutoSecondPath" + } + }, + { + "type": "path", + "data": { + "pathName": "RightBumpThirdCycle" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightTrenchAuto.auto similarity index 100% rename from src/main/deploy/pathplanner/autos/OneLoopRightTrenchAuto.auto rename to src/main/deploy/pathplanner/autos/TwoLoopRightTrenchAuto.auto diff --git a/src/main/deploy/pathplanner/paths/BackUpFromHub.path b/src/main/deploy/pathplanner/paths/BackUpFromHub.path index 366b2dfa..da7fe31a 100644 --- a/src/main/deploy/pathplanner/paths/BackUpFromHub.path +++ b/src/main/deploy/pathplanner/paths/BackUpFromHub.path @@ -33,8 +33,8 @@ "pointTowardsZones": [], "eventMarkers": [], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 1f135726..149cddf2 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -21,7 +21,7 @@ }, "prevControl": { "x": 6.732261910150816, - "y": 0.8718031076549311 + "y": 0.8718031076549312 }, "nextControl": { "x": 7.917576046100175, @@ -92,7 +92,52 @@ ], "constraintZones": [], "pointTowardsZones": [], - "eventMarkers": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.5219347581552318, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.7199100112485947, + "endWaypointRelativePos": 2.6906636670416195, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.167604049493815, + "endWaypointRelativePos": 3.842519685039372, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.653543307086616, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], "globalConstraints": { "maxVelocity": 5.0, "maxAcceleration": 9.0, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path new file mode 100644 index 00000000..03281809 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -0,0 +1,178 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 2.632, + "y": 1.297 + }, + "prevControl": null, + "nextControl": { + "x": 2.7074970344009497, + "y": 0.2639027283511268 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.06497034400949, + "y": 0.974009489916964 + }, + "prevControl": { + "x": 6.105564520356331, + "y": 0.5512127810322003 + }, + "nextControl": { + "x": 8.129642312428036, + "y": 1.443195514424521 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.269395017793595, + "y": 3.1904033214709373 + }, + "prevControl": { + "x": 8.500380025964915, + "y": 3.133323844619855 + }, + "nextControl": { + "x": 7.019663345066641, + "y": 3.2019831158126864 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.073309608540926, + "y": 2.318908659549229 + }, + "prevControl": { + "x": 3.403406500038096, + "y": 2.418789121552157 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.5435168738898771, + "rotationDegrees": -1.3642985911582572 + } + ], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 1.0 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.25, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 8.0, + "y": 5.5 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.1878515185601808, + "maxWaypointRelativePos": 1.545556805399325, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 2.0, + "y": 2.0 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 2.0112485939257607, + "maxWaypointRelativePos": 2.9291338582677215, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.18897637795275782, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.7019122609673796, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.857142857142857, + "endWaypointRelativePos": 2.4836895388076488, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 2.625421822272216, + "endWaypointRelativePos": 2.8211473565804193, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 2.7266591676040424, + "endWaypointRelativePos": 3.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -124.04593735660168 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": -128.517 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/DepoToTowerPath.path b/src/main/deploy/pathplanner/paths/DepoToTowerPath.path index bb5bb83c..37b97c7a 100644 --- a/src/main/deploy/pathplanner/paths/DepoToTowerPath.path +++ b/src/main/deploy/pathplanner/paths/DepoToTowerPath.path @@ -47,8 +47,8 @@ "pointTowardsZones": [], "eventMarkers": [], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/FirstCycleLeft.path b/src/main/deploy/pathplanner/paths/FirstCycleLeft.path index a0ecf85f..72979e3c 100644 --- a/src/main/deploy/pathplanner/paths/FirstCycleLeft.path +++ b/src/main/deploy/pathplanner/paths/FirstCycleLeft.path @@ -142,8 +142,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/FirstCycleRight.path b/src/main/deploy/pathplanner/paths/FirstCycleRight.path index 79d26dd5..901b8125 100644 --- a/src/main/deploy/pathplanner/paths/FirstCycleRight.path +++ b/src/main/deploy/pathplanner/paths/FirstCycleRight.path @@ -148,8 +148,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/GoBackToAllianceZone.path b/src/main/deploy/pathplanner/paths/GoBackToAllianceZone.path index 5d636e79..6bc670c1 100644 --- a/src/main/deploy/pathplanner/paths/GoBackToAllianceZone.path +++ b/src/main/deploy/pathplanner/paths/GoBackToAllianceZone.path @@ -49,8 +49,8 @@ "pointTowardsZones": [], "eventMarkers": [], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/GoUnderTrench.path b/src/main/deploy/pathplanner/paths/GoUnderTrench.path index 9a9b4eac..3ececa62 100644 --- a/src/main/deploy/pathplanner/paths/GoUnderTrench.path +++ b/src/main/deploy/pathplanner/paths/GoUnderTrench.path @@ -40,8 +40,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/HubToDepoPath.path b/src/main/deploy/pathplanner/paths/HubToDepoPath.path index 3f2287e6..46e519cf 100644 --- a/src/main/deploy/pathplanner/paths/HubToDepoPath.path +++ b/src/main/deploy/pathplanner/paths/HubToDepoPath.path @@ -73,8 +73,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/New Path.path b/src/main/deploy/pathplanner/paths/New Path.path deleted file mode 100644 index 1d472cce..00000000 --- a/src/main/deploy/pathplanner/paths/New Path.path +++ /dev/null @@ -1,88 +0,0 @@ -{ - "version": "2025.0", - "waypoints": [ - { - "anchor": { - "x": 2.632, - "y": 1.297 - }, - "prevControl": null, - "nextControl": { - "x": 2.6106642941874263, - "y": 0.5221233689205222 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 7.463060498220641, - "y": 0.9955278766310789 - }, - "prevControl": { - "x": 7.226358244365363, - "y": 0.24238434163701073 - }, - "nextControl": { - "x": 7.766096227730168, - "y": 1.9597324705250283 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 3.729620403321471, - "y": 2.3511862396204037 - }, - "prevControl": { - "x": 4.2061825446609, - "y": 2.1741729397609575 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [], - "constraintZones": [], - "pointTowardsZones": [ - { - "fieldPosition": { - "x": 7.0, - "y": 1.0 - }, - "rotationOffset": 0.0, - "minWaypointRelativePos": 0.0, - "maxWaypointRelativePos": 0.25, - "name": "Point Towards Zone" - } - ], - "eventMarkers": [ - { - "name": "", - "waypointRelativePos": 0, - "endWaypointRelativePos": null, - "command": null - } - ], - "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, - "maxAngularVelocity": 540.0, - "maxAngularAcceleration": 720.0, - "nominalVoltage": 12.0, - "unlimited": false - }, - "goalEndState": { - "velocity": 0, - "rotation": 0.0 - }, - "reversed": false, - "folder": null, - "idealStartingState": { - "velocity": 0, - "rotation": -128.517 - }, - "useDefaultConstraints": true -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/ResetToTrench.path b/src/main/deploy/pathplanner/paths/ResetToTrench.path index b61a65c7..e4fa61bb 100644 --- a/src/main/deploy/pathplanner/paths/ResetToTrench.path +++ b/src/main/deploy/pathplanner/paths/ResetToTrench.path @@ -33,8 +33,8 @@ "pointTowardsZones": [], "eventMarkers": [], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path new file mode 100644 index 00000000..87e59658 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -0,0 +1,162 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.073, + "y": 2.319 + }, + "prevControl": null, + "nextControl": { + "x": 2.492313167265167, + "y": 0.834139976280585 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 4.31061684460261, + "y": 0.5974377224199281 + }, + "prevControl": { + "x": 4.060620001028775, + "y": 0.5986939879648939 + }, + "nextControl": { + "x": 6.451696322662557, + "y": 0.5866785290682492 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.26879003558719, + "y": 3.1366073546856454 + }, + "prevControl": { + "x": 6.225753262164336, + "y": 1.5442467378464222 + }, + "nextControl": { + "x": 6.29666271627912, + "y": 4.1678965404124275 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.689003558724242, + "y": 2.598647686838119 + }, + "prevControl": { + "x": 7.514429591403098, + "y": 3.337813224375998 + }, + "nextControl": { + "x": 7.806356641763113, + "y": 2.1017617190318014 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.312431791227208, + "y": 0.930972716494108 + }, + "prevControl": { + "x": 7.504834361620928, + "y": 1.32528610851128 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 0.65 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.1203599550056242, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 6.5, + "y": 5.5 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.53880764904387, + "maxWaypointRelativePos": 1.9617547806524194, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 7.0, + "y": 3.5 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.96, + "maxWaypointRelativePos": 2.474690663667043, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.15298087739032834, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.151856017997751, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.2418447694038248, + "endWaypointRelativePos": 3.977502812148512, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -152.50086126910077 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": -124.046 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/SecondCycleLeft.path b/src/main/deploy/pathplanner/paths/SecondCycleLeft.path index bea53078..f2ece127 100644 --- a/src/main/deploy/pathplanner/paths/SecondCycleLeft.path +++ b/src/main/deploy/pathplanner/paths/SecondCycleLeft.path @@ -211,8 +211,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/SecondCycleRight.path b/src/main/deploy/pathplanner/paths/SecondCycleRight.path index 88f7ce44..91747cf9 100644 --- a/src/main/deploy/pathplanner/paths/SecondCycleRight.path +++ b/src/main/deploy/pathplanner/paths/SecondCycleRight.path @@ -217,8 +217,8 @@ } ], "globalConstraints": { - "maxVelocity": 2.5, - "maxAcceleration": 3.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/settings.json b/src/main/deploy/pathplanner/settings.json index befe0111..a04b68fb 100644 --- a/src/main/deploy/pathplanner/settings.json +++ b/src/main/deploy/pathplanner/settings.json @@ -7,8 +7,8 @@ "NoEventMarkers" ], "autoFolders": [], - "defaultMaxVel": 2.5, - "defaultMaxAccel": 3.0, + "defaultMaxVel": 5.0, + "defaultMaxAccel": 9.0, "defaultMaxAngVel": 540.0, "defaultMaxAngAccel": 720.0, "defaultNominalVoltage": 12.0, @@ -17,7 +17,7 @@ "robotTrackwidth": 0.546, "driveWheelRadius": 0.051, "driveGearing": 6.48, - "maxDriveSpeed": 4.5, + "maxDriveSpeed": 5.0, "driveMotorType": "krakenX60", "driveCurrentLimit": 45.0, "wheelCOF": 1.2, diff --git a/src/main/java/competition/auto/pathplanner/TwoLoopRightBumpAuto.java b/src/main/java/competition/auto/pathplanner/TwoLoopRightBumpAuto.java new file mode 100644 index 00000000..a734e988 --- /dev/null +++ b/src/main/java/competition/auto/pathplanner/TwoLoopRightBumpAuto.java @@ -0,0 +1,21 @@ +package competition.auto.pathplanner; + +import com.pathplanner.lib.auto.AutoBuilder; +import competition.auto.BaseAutonomousSequentialCommandGroup; +import xbot.common.properties.PropertyFactory; +import xbot.common.subsystems.autonomous.AutonomousCommandSelector; + +import javax.inject.Inject; + +public class TwoLoopRightBumpAuto extends BaseAutonomousSequentialCommandGroup { + @Inject + public TwoLoopRightBumpAuto( + AutonomousCommandSelector autoSelector, + PropertyFactory pf + ) { + super(autoSelector); + pf.setPrefix(this.getName()); + + this.addCommands(AutoBuilder.buildAuto("TwoLoopRightBumpAuto")); + } +} diff --git a/src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java b/src/main/java/competition/auto/pathplanner/TwoLoopRightTrenchAuto.java similarity index 75% rename from src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java rename to src/main/java/competition/auto/pathplanner/TwoLoopRightTrenchAuto.java index c22bef43..2d63fefc 100644 --- a/src/main/java/competition/auto/pathplanner/OneLoopRightTrenchAuto.java +++ b/src/main/java/competition/auto/pathplanner/TwoLoopRightTrenchAuto.java @@ -7,15 +7,15 @@ import javax.inject.Inject; -public class OneLoopRightTrenchAuto extends BaseAutonomousSequentialCommandGroup { +public class TwoLoopRightTrenchAuto extends BaseAutonomousSequentialCommandGroup { @Inject - public OneLoopRightTrenchAuto( + public TwoLoopRightTrenchAuto( AutonomousCommandSelector autoSelector, PropertyFactory pf ) { super(autoSelector); pf.setPrefix(this.getName()); - this.addCommands(AutoBuilder.buildAuto("OneLoopRightTrenchAuto")); + this.addCommands(AutoBuilder.buildAuto("TwoLoopRightTrenchAuto")); } } diff --git a/src/main/java/competition/operator_interface/OperatorCommandMap.java b/src/main/java/competition/operator_interface/OperatorCommandMap.java index 23b77909..696a7d77 100644 --- a/src/main/java/competition/operator_interface/OperatorCommandMap.java +++ b/src/main/java/competition/operator_interface/OperatorCommandMap.java @@ -218,9 +218,13 @@ public void setupAutoCommands(Provider setAutonomousComman normalBumpAutoRight.setAutoCommand(AutoBuilder.buildAuto("NormalBumpAutoRight")); normalBumpAutoRight.includeOnSmartDashboard("Normal Bump Auto Right"); - var oneLoopRightTrenchAuto = setAutonomousCommandProvider.get(); - oneLoopRightTrenchAuto.setAutoCommand(AutoBuilder.buildAuto("OneLoopRightTrenchAuto")); - oneLoopRightTrenchAuto.includeOnSmartDashboard("One Loop Right Trench Auto"); + var twoLoopRightTrenchAuto = setAutonomousCommandProvider.get(); + twoLoopRightTrenchAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopRightTrenchAuto")); + twoLoopRightTrenchAuto.includeOnSmartDashboard("Two Loop Right Trench Auto"); + + var twoLoopRightBumpAuto = setAutonomousCommandProvider.get(); + twoLoopRightBumpAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopRightBumpAuto")); + twoLoopRightBumpAuto.includeOnSmartDashboard("Two Loop Right Bump Auto"); } @Inject From 5818f728b7f995caa1f80a6937cab2a3e566456e Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 17 Oct 2026 14:55:37 -0700 Subject: [PATCH 12/22] stop auto from hitting the sides --- .../autos/TwoLoopRightBumpAuto.auto | 38 ++++++++++++++++ .../pathplanner/paths/BumpAutoFirstPath.path | 44 +++++++++---------- .../pathplanner/paths/BumpAutoSecondPath.path | 40 ++++++++--------- .../paths/RightBumpThirdCycle.path | 12 ++--- .../pathplanner/paths/RightTrenchMidPath.path | 14 +++--- .../paths/SecondRightTrenchMidPath.path | 14 +++--- 6 files changed, 100 insertions(+), 62 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto index e0a508c6..8a34225d 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -10,12 +10,50 @@ "pathName": "BumpAutoFirstPath" } }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, { "type": "path", "data": { "pathName": "BumpAutoSecondPath" } }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, { "type": "path", "data": { diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 149cddf2..4f0a787d 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 5.36870203753537, - "y": 0.49779418255790475 + "x": 5.260045713603037, + "y": 0.6183641487018781 }, "isLocked": false, "linkedName": null @@ -20,56 +20,56 @@ "y": 1.651838671411625 }, "prevControl": { - "x": 6.732261910150816, - "y": 0.8718031076549312 + "x": 6.792745227785006, + "y": 0.7094556226335216 }, "nextControl": { - "x": 7.917576046100175, - "y": 1.806655690385973 + "x": 7.926546184826253, + "y": 1.8601648089347456 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.893428232502968, - "y": 2.7169988137603784 + "x": 7.721281138790035, + "y": 3.158125741399763 }, "prevControl": { - "x": 8.130965489993711, - "y": 2.359525232235475 + "x": 8.235155398904096, + "y": 3.3527750823520592 }, "nextControl": { - "x": 6.982008731897769, - "y": 4.088608457631414 + "x": 7.011174377224199, + "y": 2.88914590747331 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 4.94540925266904, - "y": 2.5018149466192163 + "x": 5.408054567022539, + "y": 2.4587781731909844 }, "prevControl": { - "x": 5.1947739276267235, - "y": 2.5196267091161935 + "x": 5.870699881376039, + "y": 2.437259786476868 }, "nextControl": { - "x": 3.7403795966785296, - "y": 2.415741399762752 + "x": 3.6664168580723415, + "y": 2.539784578258435 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 2.6321826809015425, - "y": 1.2967852906287078 + "x": 1.5562633451957297, + "y": 1.7917081850533805 }, "prevControl": { - "x": 2.750533807829182, - "y": 2.2113167259786475 + "x": 2.8366073546856474, + "y": 2.437259786476868 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index 03281809..df3a8b3a 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -3,13 +3,13 @@ "waypoints": [ { "anchor": { - "x": 2.632, - "y": 1.297 + "x": 1.556, + "y": 1.792 }, "prevControl": null, "nextControl": { - "x": 2.7074970344009497, - "y": 0.2639027283511268 + "x": 0.0607354685646504, + "y": -0.650628706998815 }, "isLocked": false, "linkedName": null @@ -20,12 +20,12 @@ "y": 0.974009489916964 }, "prevControl": { - "x": 6.105564520356331, - "y": 0.5512127810322003 + "x": 6.15043890865955, + "y": 0.9740094899169641 }, "nextControl": { - "x": 8.129642312428036, - "y": 1.443195514424521 + "x": 8.228440122701414, + "y": 0.974009489916964 }, "isLocked": false, "linkedName": null @@ -36,24 +36,24 @@ "y": 3.1904033214709373 }, "prevControl": { - "x": 8.500380025964915, - "y": 3.133323844619855 + "x": 8.473236387578428, + "y": 3.4537436211113697 }, "nextControl": { - "x": 7.019663345066641, - "y": 3.2019831158126864 + "x": 6.925100830367736, + "y": 3.1150889679715306 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 3.073309608540926, - "y": 2.318908659549229 + "x": 1.9866310794780553, + "y": 1.910059311981021 }, "prevControl": { - "x": 3.403406500038096, - "y": 2.418789121552157 + "x": 2.3201660735468574, + "y": 2.4049822064056934 }, "nextControl": null, "isLocked": false, @@ -62,7 +62,7 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.5435168738898771, + "waypointRelativePos": 0.6500888099467169, "rotationDegrees": -1.3642985911582572 } ], @@ -71,10 +71,10 @@ { "fieldPosition": { "x": 7.0, - "y": 1.0 + "y": 0.5 }, "rotationOffset": 0.0, - "minWaypointRelativePos": 0.0, + "minWaypointRelativePos": 0.14848143982002215, "maxWaypointRelativePos": 0.25, "name": "Point Towards Zone" }, @@ -172,7 +172,7 @@ "folder": null, "idealStartingState": { "velocity": 0, - "rotation": -128.517 + "rotation": -133.32128763210224 }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index 87e59658..e602a0b0 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -3,13 +3,13 @@ "waypoints": [ { "anchor": { - "x": 3.073, - "y": 2.319 + "x": 1.987, + "y": 1.91 }, "prevControl": null, "nextControl": { - "x": 2.492313167265167, - "y": 0.834139976280585 + "x": -0.20824436536180269, + "y": 0.016441281138790176 }, "isLocked": false, "linkedName": null @@ -20,8 +20,8 @@ "y": 0.5974377224199281 }, "prevControl": { - "x": 4.060620001028775, - "y": 0.5986939879648939 + "x": 4.0606200010287745, + "y": 0.598693987964894 }, "nextControl": { "x": 6.451696322662557, diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index f7ef24f3..2e225cee 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 4.679781004711073, - "y": 0.6192534821176207 + "x": 4.199971548646286, + "y": 0.5318025271866911 }, "isLocked": false, "linkedName": null @@ -20,12 +20,12 @@ "y": 1.264507710557533 }, "prevControl": { - "x": 7.4523013048635836, - "y": 0.016441281138789954 + "x": 7.6997627520759195, + "y": -0.26329774614472146 }, "nextControl": { - "x": 7.719388011461684, - "y": 1.9528199039750431 + "x": 7.590237811407521, + "y": 1.9584939074141878 }, "isLocked": false, "linkedName": null @@ -174,7 +174,7 @@ }, "goalEndState": { "velocity": 0, - "rotation": -110.40988283380406 + "rotation": -110.40988283380408 }, "reversed": false, "folder": null, diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path index 6ceeb631..699a656e 100644 --- a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -48,16 +48,16 @@ }, { "anchor": { - "x": 6.2903084223013055, - "y": 0.5974377224199281 + "x": 6.570047449584817, + "y": 0.554400948991697 }, "prevControl": { - "x": 6.662217575823889, - "y": 0.7240684767959131 + "x": 6.960861834076264, + "y": 0.5945989999679602 }, "nextControl": { - "x": 5.895218721177708, - "y": 0.4629142603712165 + "x": 4.6871886120996455, + "y": 0.3607354685646501 }, "isLocked": false, "linkedName": null @@ -69,7 +69,7 @@ }, "prevControl": { "x": 5.7820656534626576, - "y": 0.4740777106352185 + "y": 0.4740777106352184 }, "nextControl": null, "isLocked": false, From 8ba3c0c5c164632e5633d5e56a8b561da732ca28 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 24 Oct 2026 11:38:10 -0700 Subject: [PATCH 13/22] left auto too --- .../autos/TwoLoopLeftBumpAuto.auto | 69 ++++++ .../autos/TwoLoopLeftTrenchAuto.auto | 69 ++++++ .../pathplanner/paths/BumpAutoFirstPath.path | 36 +-- .../pathplanner/paths/BumpAutoSecondPath.path | 60 +++-- .../paths/LeftBumpAutoFirstPath.path | 160 +++++++++++++ .../paths/LeftBumpAutoSecondPath.path | 194 +++++++++++++++ .../pathplanner/paths/LeftBumpThirdCycle.path | 162 +++++++++++++ .../pathplanner/paths/LeftTrenchMidPath.path | 186 +++++++++++++++ .../pathplanner/paths/LeftTrenchToMid.path | 104 ++++++++ .../paths/SecondLeftTrenchMidPath.path | 223 ++++++++++++++++++ .../auto/pathplanner/TwoLoopLeftBumpAuto.java | 21 ++ .../pathplanner/TwoLoopLeftTrenchAuto.java | 21 ++ .../OperatorCommandMap.java | 8 + 13 files changed, 1273 insertions(+), 40 deletions(-) create mode 100644 src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto create mode 100644 src/main/deploy/pathplanner/autos/TwoLoopLeftTrenchAuto.auto create mode 100644 src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path create mode 100644 src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path create mode 100644 src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path create mode 100644 src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path create mode 100644 src/main/deploy/pathplanner/paths/LeftTrenchToMid.path create mode 100644 src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path create mode 100644 src/main/java/competition/auto/pathplanner/TwoLoopLeftBumpAuto.java create mode 100644 src/main/java/competition/auto/pathplanner/TwoLoopLeftTrenchAuto.java diff --git a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto new file mode 100644 index 00000000..50fc6439 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto @@ -0,0 +1,69 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "LeftBumpAutoFirstPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "LeftBumpAutoSecondPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "LeftBumpThirdCycle" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/TwoLoopLeftTrenchAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopLeftTrenchAuto.auto new file mode 100644 index 00000000..952d1f43 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/TwoLoopLeftTrenchAuto.auto @@ -0,0 +1,69 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "LeftTrenchMidPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "SecondLeftTrenchMidPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "LeftTrenchToMid" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 4f0a787d..aceac063 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 5.260045713603037, - "y": 0.6183641487018781 + "x": 5.256034573754649, + "y": 0.4002295503000877 }, "isLocked": false, "linkedName": null @@ -20,12 +20,12 @@ "y": 1.651838671411625 }, "prevControl": { - "x": 6.792745227785006, - "y": 0.7094556226335216 + "x": 6.889719646260355, + "y": 0.5616424403239051 }, "nextControl": { - "x": 7.926546184826253, - "y": 1.8601648089347456 + "x": 8.084961682729203, + "y": 2.12863222412446 }, "isLocked": false, "linkedName": null @@ -36,28 +36,28 @@ "y": 3.158125741399763 }, "prevControl": { - "x": 8.235155398904096, - "y": 3.3527750823520592 + "x": 8.229531600853718, + "y": 3.0151135795691766 }, "nextControl": { - "x": 7.011174377224199, - "y": 2.88914590747331 + "x": 6.870946311859619, + "y": 3.3973940371635925 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 5.408054567022539, - "y": 2.4587781731909844 + "x": 5.397295373665481, + "y": 2.5556109134045073 }, "prevControl": { - "x": 5.870699881376039, - "y": 2.437259786476868 + "x": 6.075049809208657, + "y": 2.570344705481533 }, "nextControl": { - "x": 3.6664168580723415, - "y": 2.539784578258435 + "x": 3.91252669039146, + "y": 2.5233333333333325 }, "isLocked": false, "linkedName": null @@ -68,8 +68,8 @@ "y": 1.7917081850533805 }, "prevControl": { - "x": 2.8366073546856474, - "y": 2.437259786476868 + "x": 2.5783867141162524, + "y": 2.4265005931198096 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index df3a8b3a..a74dfb06 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -8,40 +8,56 @@ }, "prevControl": null, "nextControl": { - "x": 0.0607354685646504, - "y": -0.650628706998815 + "x": -0.26062299971986747, + "y": -0.3839157238983384 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.06497034400949, - "y": 0.974009489916964 + "x": 7.011174377224199, + "y": 0.6727520759193351 }, "prevControl": { - "x": 6.15043890865955, - "y": 0.9740094899169641 + "x": 6.151014935129701, + "y": 0.6310285006704206 }, "nextControl": { - "x": 8.228440122701414, - "y": 0.974009489916964 + "x": 8.049723690138467, + "y": 0.7231287715486632 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.269395017793595, - "y": 3.1904033214709373 + "x": 7.592170818505339, + "y": 3.3087544483985765 }, "prevControl": { - "x": 8.473236387578428, - "y": 3.4537436211113697 + "x": 8.399588492208746, + "y": 3.554438521591162 }, "nextControl": { - "x": 6.925100830367736, - "y": 3.1150889679715306 + "x": 6.612750657635942, + "y": 3.0107328143344674 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.558683274021353, + "y": 2.469537366548043 + }, + "prevControl": { + "x": 6.41351193215274, + "y": 2.5227398571627173 + }, + "nextControl": { + "x": 4.539714250979714, + "y": 2.406119172306029 }, "isLocked": false, "linkedName": null @@ -52,8 +68,8 @@ "y": 1.910059311981021 }, "prevControl": { - "x": 2.3201660735468574, - "y": 2.4049822064056934 + "x": 2.8727701115753925, + "y": 2.567344505132228 }, "nextControl": null, "isLocked": false, @@ -74,8 +90,8 @@ "y": 0.5 }, "rotationOffset": 0.0, - "minWaypointRelativePos": 0.14848143982002215, - "maxWaypointRelativePos": 0.25, + "minWaypointRelativePos": 0.01, + "maxWaypointRelativePos": 0.2969628796400511, "name": "Point Towards Zone" }, { @@ -94,8 +110,8 @@ "y": 2.0 }, "rotationOffset": 0.0, - "minWaypointRelativePos": 2.0112485939257607, - "maxWaypointRelativePos": 2.9291338582677215, + "minWaypointRelativePos": 2.0, + "maxWaypointRelativePos": 3.85, "name": "Point Towards Zone" } ], @@ -135,7 +151,7 @@ }, { "name": "WarmupShooterNear", - "waypointRelativePos": 2.625421822272216, + "waypointRelativePos": 3.25, "endWaypointRelativePos": 2.8211473565804193, "command": { "type": "named", @@ -146,7 +162,7 @@ }, { "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", - "waypointRelativePos": 2.7266591676040424, + "waypointRelativePos": 3.45, "endWaypointRelativePos": 3.0, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path new file mode 100644 index 00000000..a7706b62 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -0,0 +1,160 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.3644128113879015, + "y": 7.451043890865955 + }, + "prevControl": null, + "nextControl": { + "x": 5.256034573754649, + "y": 7.669770449699913 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.721281138790035, + "y": 6.418161328588376 + }, + "prevControl": { + "x": 6.889719646260355, + "y": 7.508357559676095 + }, + "nextControl": { + "x": 8.084961682729203, + "y": 5.94136777587554 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.721281138790035, + "y": 4.911874258600237 + }, + "prevControl": { + "x": 8.229531600853718, + "y": 5.054886420430824 + }, + "nextControl": { + "x": 6.870946311859619, + "y": 4.672605962836408 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.397295373665481, + "y": 5.514389086595493 + }, + "prevControl": { + "x": 6.075049809208657, + "y": 5.499655294518467 + }, + "nextControl": { + "x": 3.91252669039146, + "y": 5.546666666666668 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 1.5562633451957297, + "y": 6.27829181494662 + }, + "prevControl": { + "x": 2.5783867141162524, + "y": 5.64349940688019 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.7833037300177648, + "rotationDegrees": -60.49320542088961 + }, + { + "waypointRelativePos": 2.8, + "rotationDegrees": 123.82264632208565 + }, + { + "waypointRelativePos": 3.45, + "rotationDegrees": 124.83241559758541 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.5219347581552318, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.7199100112485947, + "endWaypointRelativePos": 2.6906636670416195, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.167604049493815, + "endWaypointRelativePos": 3.842519685039372, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.653543307086616, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 128.5169263071027 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 0.0 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path new file mode 100644 index 00000000..4a9ac666 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -0,0 +1,194 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.556, + "y": 6.2780000000000005 + }, + "prevControl": null, + "nextControl": { + "x": -0.26062299971986747, + "y": 8.453915723898339 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.011174377224199, + "y": 7.3972479240806654 + }, + "prevControl": { + "x": 6.151014935129701, + "y": 7.43897149932958 + }, + "nextControl": { + "x": 8.049723690138467, + "y": 7.346871228451337 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.592170818505339, + "y": 4.761245551601424 + }, + "prevControl": { + "x": 8.399588492208746, + "y": 4.515561478408838 + }, + "nextControl": { + "x": 6.612750657635942, + "y": 5.059267185665533 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.558683274021353, + "y": 5.600462633451958 + }, + "prevControl": { + "x": 6.41351193215274, + "y": 5.547260142837283 + }, + "nextControl": { + "x": 4.539714250979714, + "y": 5.663880827693971 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 1.9866310794780553, + "y": 6.159940688018979 + }, + "prevControl": { + "x": 2.8727701115753925, + "y": 5.502655494867772 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.6500888099467169, + "rotationDegrees": 1.3642985911582572 + } + ], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 7.57 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.01, + "maxWaypointRelativePos": 0.2969628796400511, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 8.0, + "y": 2.5700000000000003 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.1878515185601808, + "maxWaypointRelativePos": 1.545556805399325, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 2.0, + "y": 6.07 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 2.0, + "maxWaypointRelativePos": 3.85, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.18897637795275782, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.7019122609673796, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.857142857142857, + "endWaypointRelativePos": 2.4836895388076488, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.25, + "endWaypointRelativePos": 2.8211473565804193, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.45, + "endWaypointRelativePos": 3.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 124.04593735660168 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 133.32128763210224 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path new file mode 100644 index 00000000..4899a9f9 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -0,0 +1,162 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.987, + "y": 6.16 + }, + "prevControl": null, + "nextControl": { + "x": -0.20824436536180269, + "y": 8.05355871886121 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 4.31061684460261, + "y": 7.472562277580073 + }, + "prevControl": { + "x": 4.0606200010287745, + "y": 7.4713060120351065 + }, + "nextControl": { + "x": 6.451696322662557, + "y": 7.483321470931751 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.26879003558719, + "y": 4.933392645314354 + }, + "prevControl": { + "x": 6.225753262164336, + "y": 6.525753262153578 + }, + "nextControl": { + "x": 6.29666271627912, + "y": 3.9021034595875728 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.689003558724242, + "y": 5.471352313161882 + }, + "prevControl": { + "x": 7.514429591403098, + "y": 4.732186775624003 + }, + "nextControl": { + "x": 7.806356641763113, + "y": 5.968238280968199 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.312431791227208, + "y": 7.139027283505892 + }, + "prevControl": { + "x": 7.504834361620928, + "y": 6.74471389148872 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 7.42 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.1203599550056242, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 6.5, + "y": 2.5700000000000003 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.53880764904387, + "maxWaypointRelativePos": 1.9617547806524194, + "name": "Point Towards Zone" + }, + { + "fieldPosition": { + "x": 7.0, + "y": 4.57 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 1.96, + "maxWaypointRelativePos": 2.474690663667043, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.15298087739032834, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.151856017997751, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.2418447694038248, + "endWaypointRelativePos": 3.977502812148512, + "command": null + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 152.50086126910077 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 124.046 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path b/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path new file mode 100644 index 00000000..5627e5e4 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path @@ -0,0 +1,186 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.43, + "y": 7.440284697508897 + }, + "prevControl": null, + "nextControl": { + "x": 4.199971548646286, + "y": 7.538197472813309 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6244483985765115, + "y": 6.805492289442467 + }, + "prevControl": { + "x": 7.6997627520759195, + "y": 8.333297746144721 + }, + "nextControl": { + "x": 7.590237811407521, + "y": 6.111506092585812 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 4.78276393831554 + }, + "prevControl": { + "x": 7.37146358665783, + "y": 4.554677928692783 + }, + "nextControl": { + "x": 8.04444218598517, + "y": 6.054314940107501 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.6130842230130495, + "y": 7.440284697508897 + }, + "prevControl": { + "x": 7.168130482156051, + "y": 7.171991722548969 + }, + "nextControl": { + "x": 6.056398333465295, + "y": 7.709370221399441 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.460640569395019, + "y": 7.300415183872522 + }, + "prevControl": { + "x": 5.0422419928825635, + "y": 7.6124317912272055 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.42628774422735244, + "rotationDegrees": -0.10827321613598044 + }, + { + "waypointRelativePos": 0.5, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 1.0284191829484794, + "rotationDegrees": -87.7606727006398 + }, + { + "waypointRelativePos": 1.420959147424509, + "rotationDegrees": -96.78976433613241 + }, + { + "waypointRelativePos": 2.749555950266447, + "rotationDegrees": 179.0040765647882 + }, + { + "waypointRelativePos": 3.95, + "rotationDegrees": -178.97451694025509 + } + ], + "constraintZones": [ + { + "name": "Collecting Speed Constraint", + "minWaypointRelativePos": 1.2238470191225992, + "maxWaypointRelativePos": 1.7367829021372558, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 4.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.5309336332958503, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9178852643419619, + "endWaypointRelativePos": 2.3937007874015763, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.2485939257592693, + "endWaypointRelativePos": 3.986501687289095, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.7435320584926886, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 110.40988283380408 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 0.0 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path b/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path new file mode 100644 index 00000000..74fa4c1e --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path @@ -0,0 +1,104 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 7.247 + }, + "prevControl": null, + "nextControl": { + "x": 4.4658539826374, + "y": 7.472305933380947 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.2903084223013055, + "y": 7.364970344009492 + }, + "prevControl": { + "x": 5.954745702065148, + "y": 7.480268753920549 + }, + "nextControl": { + "x": 7.298432337453816, + "y": 7.018581793074536 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.4307829181494665, + "y": 6.90232502965599 + }, + "prevControl": { + "x": 6.764789446774394, + "y": 7.209319828245329 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 7.32 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.4094488188976311, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.1124859392575941, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.1473565804274435, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -55.58163552094366 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0.0, + "rotation": 119.05499999999999 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path new file mode 100644 index 00000000..5e3cbc4f --- /dev/null +++ b/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path @@ -0,0 +1,223 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 7.247 + }, + "prevControl": null, + "nextControl": { + "x": 3.977081850533809, + "y": 7.461803084223015 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.602930011862398, + "y": 6.934602609727165 + }, + "prevControl": { + "x": 7.1056243047031655, + "y": 7.866358155492773 + }, + "nextControl": { + "x": 7.85996478920588, + "y": 6.4530204042614745 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 4.78276393831554 + }, + "prevControl": { + "x": 7.3948579297193335, + "y": 4.545561408471901 + }, + "nextControl": { + "x": 8.063462794625597, + "y": 6.554062253551836 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.570047449584817, + "y": 7.515599051008303 + }, + "prevControl": { + "x": 6.960861834076264, + "y": 7.47540100003204 + }, + "nextControl": { + "x": 4.6871886120996455, + "y": 7.70926453143535 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.514, + "y": 7.247 + }, + "prevControl": { + "x": 5.7820656534626576, + "y": 7.595922289364782 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.42628774422735244, + "rotationDegrees": -0.10827321613598044 + }, + { + "waypointRelativePos": 0.5, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 1.0284191829484794, + "rotationDegrees": -87.7606727006398 + }, + { + "waypointRelativePos": 1.420959147424509, + "rotationDegrees": -96.78976433613241 + }, + { + "waypointRelativePos": 2.749555950266447, + "rotationDegrees": 179.0040765647882 + }, + { + "waypointRelativePos": 3.75, + "rotationDegrees": -178.97451694025509 + }, + { + "waypointRelativePos": 3.95, + "rotationDegrees": -180.0 + } + ], + "constraintZones": [ + { + "name": "Collecting Speed Constraint", + "minWaypointRelativePos": 1.340832395950507, + "maxWaypointRelativePos": 1.637795275590552, + "constraints": { + "maxVelocity": 3.5, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 7.32 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.3509561304836896, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.035995500562435306, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.1889763779527467, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.5309336332958503, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9178852643419619, + "endWaypointRelativePos": 2.3937007874015763, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.482564679415074, + "endWaypointRelativePos": 3.986501687289095, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.75, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup" + } + } + } + ], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": 119.05499999999999 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "rotation": 119.05499999999999 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/java/competition/auto/pathplanner/TwoLoopLeftBumpAuto.java b/src/main/java/competition/auto/pathplanner/TwoLoopLeftBumpAuto.java new file mode 100644 index 00000000..bfb17dfa --- /dev/null +++ b/src/main/java/competition/auto/pathplanner/TwoLoopLeftBumpAuto.java @@ -0,0 +1,21 @@ +package competition.auto.pathplanner; + +import com.pathplanner.lib.auto.AutoBuilder; +import competition.auto.BaseAutonomousSequentialCommandGroup; +import xbot.common.properties.PropertyFactory; +import xbot.common.subsystems.autonomous.AutonomousCommandSelector; + +import javax.inject.Inject; + +public class TwoLoopLeftBumpAuto extends BaseAutonomousSequentialCommandGroup { + @Inject + public TwoLoopLeftBumpAuto( + AutonomousCommandSelector autoSelector, + PropertyFactory pf + ) { + super(autoSelector); + pf.setPrefix(this.getName()); + + this.addCommands(AutoBuilder.buildAuto("TwoLoopLeftBumpAuto")); + } +} diff --git a/src/main/java/competition/auto/pathplanner/TwoLoopLeftTrenchAuto.java b/src/main/java/competition/auto/pathplanner/TwoLoopLeftTrenchAuto.java new file mode 100644 index 00000000..314a4e0d --- /dev/null +++ b/src/main/java/competition/auto/pathplanner/TwoLoopLeftTrenchAuto.java @@ -0,0 +1,21 @@ +package competition.auto.pathplanner; + +import com.pathplanner.lib.auto.AutoBuilder; +import competition.auto.BaseAutonomousSequentialCommandGroup; +import xbot.common.properties.PropertyFactory; +import xbot.common.subsystems.autonomous.AutonomousCommandSelector; + +import javax.inject.Inject; + +public class TwoLoopLeftTrenchAuto extends BaseAutonomousSequentialCommandGroup { + @Inject + public TwoLoopLeftTrenchAuto( + AutonomousCommandSelector autoSelector, + PropertyFactory pf + ) { + super(autoSelector); + pf.setPrefix(this.getName()); + + this.addCommands(AutoBuilder.buildAuto("TwoLoopLeftTrenchAuto")); + } +} diff --git a/src/main/java/competition/operator_interface/OperatorCommandMap.java b/src/main/java/competition/operator_interface/OperatorCommandMap.java index 696a7d77..5f94a120 100644 --- a/src/main/java/competition/operator_interface/OperatorCommandMap.java +++ b/src/main/java/competition/operator_interface/OperatorCommandMap.java @@ -222,9 +222,17 @@ public void setupAutoCommands(Provider setAutonomousComman twoLoopRightTrenchAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopRightTrenchAuto")); twoLoopRightTrenchAuto.includeOnSmartDashboard("Two Loop Right Trench Auto"); + var twoLoopLeftTrenchAuto = setAutonomousCommandProvider.get(); + twoLoopLeftTrenchAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopLeftTrenchAuto")); + twoLoopLeftTrenchAuto.includeOnSmartDashboard("Two Loop Left Trench Auto"); + var twoLoopRightBumpAuto = setAutonomousCommandProvider.get(); twoLoopRightBumpAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopRightBumpAuto")); twoLoopRightBumpAuto.includeOnSmartDashboard("Two Loop Right Bump Auto"); + + var twoLoopLeftBumpAuto = setAutonomousCommandProvider.get(); + twoLoopLeftBumpAuto.setAutoCommand(AutoBuilder.buildAuto("TwoLoopLeftBumpAuto")); + twoLoopLeftBumpAuto.includeOnSmartDashboard("Two Loop Left Bump Auto"); } @Inject From c702043968b81e515a7aca2a4809f8c34442ba12 Mon Sep 17 00:00:00 2001 From: Rongrui Zhu Date: Sat, 24 Oct 2026 12:02:05 -0700 Subject: [PATCH 14/22] Add name indicators for different prepare commands --- .../operator_interface/OperatorCommandMap.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/competition/operator_interface/OperatorCommandMap.java b/src/main/java/competition/operator_interface/OperatorCommandMap.java index 5f94a120..558b373b 100644 --- a/src/main/java/competition/operator_interface/OperatorCommandMap.java +++ b/src/main/java/competition/operator_interface/OperatorCommandMap.java @@ -101,13 +101,17 @@ public void setupOperatorGamepad(OperatorInterface operatorInterface, IntakeSlowlyAndFireWhenReady intakeSlowlyAndFireWhenReady, Provider prepareToShootCommand) { var prepareToShootNear = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.NEAR); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.NEAR) + .withName("PrepareToShootNEAR"); var prepareToShootTowerClose = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TOWER_FAR); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TOWER_FAR) + .withName("PrepareToShootTOWERFAR"); var prepareToShootTrench = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TRENCH); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TRENCH) + .withName("PrepareToShootTRENCH"); var prepareToShootCorner = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.CORNER); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.CORNER) + .withName("PrepareToShootCORNER"); operatorInterface.operatorGamepad.getifAvailable(XXboxController.XboxButton.RightTrigger) .whileTrue(intakeSlowlyAndFireWhenReady); From 391ae46695f8e8fefdd85499cf0ec671ca2fdaea Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 24 Oct 2026 12:48:05 -0700 Subject: [PATCH 15/22] re-commit --- .../operator_interface/OperatorCommandMap.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/competition/operator_interface/OperatorCommandMap.java b/src/main/java/competition/operator_interface/OperatorCommandMap.java index 5f94a120..558b373b 100644 --- a/src/main/java/competition/operator_interface/OperatorCommandMap.java +++ b/src/main/java/competition/operator_interface/OperatorCommandMap.java @@ -101,13 +101,17 @@ public void setupOperatorGamepad(OperatorInterface operatorInterface, IntakeSlowlyAndFireWhenReady intakeSlowlyAndFireWhenReady, Provider prepareToShootCommand) { var prepareToShootNear = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.NEAR); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.NEAR) + .withName("PrepareToShootNEAR"); var prepareToShootTowerClose = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TOWER_FAR); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TOWER_FAR) + .withName("PrepareToShootTOWERFAR"); var prepareToShootTrench = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TRENCH); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.TRENCH) + .withName("PrepareToShootTRENCH"); var prepareToShootCorner = prepareToShootCommand.get() - .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.CORNER); + .setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.CORNER) + .withName("PrepareToShootCORNER"); operatorInterface.operatorGamepad.getifAvailable(XXboxController.XboxButton.RightTrigger) .whileTrue(intakeSlowlyAndFireWhenReady); From 401519d370ad7735839fc5b395544bc96e435953 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 24 Oct 2026 13:52:09 -0700 Subject: [PATCH 16/22] slow down auto to prevent vision blurring --- .../autos/TwoLoopLeftBumpAuto.auto | 4 +-- .../autos/TwoLoopRightBumpAuto.auto | 4 +-- .../pathplanner/paths/BumpAutoFirstPath.path | 20 +++++++++-- .../pathplanner/paths/BumpAutoSecondPath.path | 36 +++++++++++++------ .../paths/LeftBumpAutoFirstPath.path | 20 +++++++++-- .../paths/LeftBumpAutoSecondPath.path | 20 +++++++++-- .../pathplanner/paths/LeftBumpThirdCycle.path | 20 +++++++++-- .../paths/RightBumpThirdCycle.path | 22 +++++++++--- 8 files changed, 115 insertions(+), 31 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto index 50fc6439..29d189ef 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 3.75 + "waitTime": 3.65 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 3.75 + "waitTime": 3.65 } }, { diff --git a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto index 8a34225d..629f7c7d 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 3.75 + "waitTime": 3.65 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 3.75 + "waitTime": 3.65 } }, { diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index aceac063..41b9b8c6 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -90,7 +90,21 @@ "rotationDegrees": -124.83241559758541 } ], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 0.6389201349831248, + "maxWaypointRelativePos": 2.393700787401576, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [], "eventMarkers": [ { @@ -139,8 +153,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index a74dfb06..31447563 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": -0.26062299971986747, - "y": -0.3839157238983384 + "x": 0.29743772241992916, + "y": -0.5430367734282318 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.011174377224199, - "y": 0.6727520759193351 + "x": 6.946619217081851, + "y": 0.5866785290628707 }, "prevControl": { - "x": 6.151014935129701, - "y": 0.6310285006704206 + "x": 6.086459774987353, + "y": 0.5449549538139562 }, "nextControl": { - "x": 8.049723690138467, - "y": 0.7231287715486632 + "x": 7.98516852999612, + "y": 0.6370552246921988 }, "isLocked": false, "linkedName": null @@ -82,7 +82,21 @@ "rotationDegrees": -1.3642985911582572 } ], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 1.232845894263218, + "maxWaypointRelativePos": 2.3757030371203673, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [ { "fieldPosition": { @@ -173,8 +187,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path index a7706b62..f5a70b9f 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -90,7 +90,21 @@ "rotationDegrees": 124.83241559758541 } ], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 0.8008998875140615, + "maxWaypointRelativePos": 2.339707536557931, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [], "eventMarkers": [ { @@ -139,8 +153,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index 4a9ac666..e552f881 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -82,7 +82,21 @@ "rotationDegrees": 1.3642985911582572 } ], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 1.3138357705286847, + "maxWaypointRelativePos": 2.3127109111361093, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [ { "fieldPosition": { @@ -173,8 +187,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index 4899a9f9..bf7143fb 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -77,7 +77,21 @@ } ], "rotationTargets": [], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 1.349831271091114, + "maxWaypointRelativePos": 3.032620922384704, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [ { "fieldPosition": { @@ -141,8 +155,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index e602a0b0..101358ac 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -9,7 +9,7 @@ "prevControl": null, "nextControl": { "x": -0.20824436536180269, - "y": 0.016441281138790176 + "y": 0.016441281138790398 }, "isLocked": false, "linkedName": null @@ -77,7 +77,21 @@ } ], "rotationTargets": [], - "constraintZones": [], + "constraintZones": [ + { + "name": "Constraints Zone", + "minWaypointRelativePos": 1.2148481439820025, + "maxWaypointRelativePos": 3.3655793025871765, + "constraints": { + "maxVelocity": 3.0, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + } + ], "pointTowardsZones": [ { "fieldPosition": { @@ -141,8 +155,8 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, - "maxAcceleration": 9.0, + "maxVelocity": 4.0, + "maxAcceleration": 7.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, From d077b03edd0135308ebeff3e9c6b4dbbd3ebb88c Mon Sep 17 00:00:00 2001 From: Victor C Date: Sat, 24 Oct 2026 17:13:31 -0700 Subject: [PATCH 17/22] slow down auto --- .../autos/TwoLoopLeftBumpAuto.auto | 4 +- .../autos/TwoLoopRightBumpAuto.auto | 4 +- .../pathplanner/paths/BumpAutoFirstPath.path | 80 ++++++++++++------ .../pathplanner/paths/BumpAutoSecondPath.path | 76 ++++++++++++----- .../paths/LeftBumpAutoFirstPath.path | 84 +++++++++++++------ .../paths/LeftBumpAutoSecondPath.path | 84 +++++++++++++------ .../pathplanner/paths/LeftBumpThirdCycle.path | 67 +++++++++++---- .../pathplanner/paths/LeftTrenchMidPath.path | 54 ++++++------ .../pathplanner/paths/LeftTrenchToMid.path | 27 +++--- .../paths/RightBumpThirdCycle.path | 59 +++++++++---- .../pathplanner/paths/RightTrenchMidPath.path | 52 ++++++------ .../pathplanner/paths/RightTrenchToMid.path | 25 +++--- .../paths/SecondLeftTrenchMidPath.path | 26 +++--- .../paths/SecondRightTrenchMidPath.path | 22 ++--- .../pathplanner/ConfigurePathPlannerLib.java | 5 ++ 15 files changed, 429 insertions(+), 240 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto index 29d189ef..d19a13e6 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 3.65 + "waitTime": 3.45 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 3.65 + "waitTime": 3.45 } }, { diff --git a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto index 629f7c7d..de6ede96 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 3.65 + "waitTime": 3.45 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 3.65 + "waitTime": 3.45 } }, { diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 41b9b8c6..588d4907 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -8,40 +8,40 @@ }, "prevControl": null, "nextControl": { - "x": 5.256034573754649, - "y": 0.4002295503000877 + "x": 5.3, + "y": 0.64 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.721281138790035, - "y": 1.651838671411625 + "x": 7.6, + "y": 1.65 }, "prevControl": { - "x": 6.889719646260355, - "y": 0.5616424403239051 + "x": 6.9, + "y": 0.7 }, "nextControl": { - "x": 8.084961682729203, - "y": 2.12863222412446 + "x": 7.85, + "y": 2.05 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.721281138790035, - "y": 3.158125741399763 + "x": 7.6, + "y": 3.16 }, "prevControl": { - "x": 8.229531600853718, - "y": 3.0151135795691766 + "x": 7.95, + "y": 3.05 }, "nextControl": { - "x": 6.870946311859619, - "y": 3.3973940371635925 + "x": 6.749665173069584, + "y": 3.3992682957638296 }, "isLocked": false, "linkedName": null @@ -78,26 +78,56 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.7833037300177648, - "rotationDegrees": 60.49320542088961 + "waypointRelativePos": 0.55, + "rotationDegrees": 0 }, { - "waypointRelativePos": 2.8, - "rotationDegrees": -123.82264632208565 + "waypointRelativePos": 0.95, + "rotationDegrees": 60.5 }, { - "waypointRelativePos": 3.45, - "rotationDegrees": -124.83241559758541 + "waypointRelativePos": 2.75, + "rotationDegrees": 180 + }, + { + "waypointRelativePos": 3.4, + "rotationDegrees": 180 } ], "constraintZones": [ { - "name": "Constraints Zone", + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.6389201349831248, + "constraints": { + "maxVelocity": 2.5, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "Middle", "minWaypointRelativePos": 0.6389201349831248, "maxWaypointRelativePos": 2.393700787401576, "constraints": { - "maxVelocity": 3.0, - "maxAcceleration": 5.0, + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 2.393700787401576, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -153,8 +183,8 @@ } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index 31447563..5d47de04 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -8,40 +8,40 @@ }, "prevControl": null, "nextControl": { - "x": 0.29743772241992916, - "y": -0.5430367734282318 + "x": 0.9, + "y": 0.3 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 6.946619217081851, - "y": 0.5866785290628707 + "x": 6.95, + "y": 0.66 }, "prevControl": { - "x": 6.086459774987353, - "y": 0.5449549538139562 + "x": 5.6, + "y": 0.64 }, "nextControl": { - "x": 7.98516852999612, - "y": 0.6370552246921988 + "x": 7.6, + "y": 1.1 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.592170818505339, - "y": 3.3087544483985765 + "x": 7.45, + "y": 3.31 }, "prevControl": { - "x": 8.399588492208746, - "y": 3.554438521591162 + "x": 7.85, + "y": 3.25 }, "nextControl": { - "x": 6.612750657635942, - "y": 3.0107328143344674 + "x": 6.470579839130603, + "y": 3.011978365935891 }, "isLocked": false, "linkedName": null @@ -78,18 +78,48 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.6500888099467169, - "rotationDegrees": -1.3642985911582572 + "waypointRelativePos": 0.6, + "rotationDegrees": 0 + }, + { + "waypointRelativePos": 0.97, + "rotationDegrees": 0 } ], "constraintZones": [ { - "name": "Constraints Zone", + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.232845894263218, + "constraints": { + "maxVelocity": 2.5, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "Middle", "minWaypointRelativePos": 1.232845894263218, "maxWaypointRelativePos": 2.3757030371203673, "constraints": { - "maxVelocity": 3.0, - "maxAcceleration": 5.0, + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 2.3757030371203673, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -166,7 +196,7 @@ { "name": "WarmupShooterNear", "waypointRelativePos": 3.25, - "endWaypointRelativePos": 2.8211473565804193, + "endWaypointRelativePos": 4.0, "command": { "type": "named", "data": { @@ -177,7 +207,7 @@ { "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", "waypointRelativePos": 3.45, - "endWaypointRelativePos": 3.0, + "endWaypointRelativePos": 4.0, "command": { "type": "named", "data": { @@ -187,8 +217,8 @@ } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path index f5a70b9f..d8d0ff9f 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -8,40 +8,40 @@ }, "prevControl": null, "nextControl": { - "x": 5.256034573754649, - "y": 7.669770449699913 + "x": 5.3, + "y": 7.430000000000001 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.721281138790035, - "y": 6.418161328588376 + "x": 7.6, + "y": 6.42 }, "prevControl": { - "x": 6.889719646260355, - "y": 7.508357559676095 + "x": 6.9, + "y": 7.37 }, "nextControl": { - "x": 8.084961682729203, - "y": 5.94136777587554 + "x": 7.85, + "y": 6.0200000000000005 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.721281138790035, - "y": 4.911874258600237 + "x": 7.6, + "y": 4.91 }, "prevControl": { - "x": 8.229531600853718, - "y": 5.054886420430824 + "x": 7.95, + "y": 5.0200000000000005 }, "nextControl": { - "x": 6.870946311859619, - "y": 4.672605962836408 + "x": 6.749665173069584, + "y": 4.670731704236171 }, "isLocked": false, "linkedName": null @@ -78,31 +78,61 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.7833037300177648, - "rotationDegrees": -60.49320542088961 + "waypointRelativePos": 0.55, + "rotationDegrees": 0 }, { - "waypointRelativePos": 2.8, - "rotationDegrees": 123.82264632208565 + "waypointRelativePos": 0.95, + "rotationDegrees": -60.5 }, { - "waypointRelativePos": 3.45, - "rotationDegrees": 124.83241559758541 + "waypointRelativePos": 2.75, + "rotationDegrees": -180 + }, + { + "waypointRelativePos": 3.4, + "rotationDegrees": -180 } ], "constraintZones": [ { - "name": "Constraints Zone", - "minWaypointRelativePos": 0.8008998875140615, - "maxWaypointRelativePos": 2.339707536557931, + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 0.6389201349831248, "constraints": { - "maxVelocity": 3.0, + "maxVelocity": 2.5, "maxAcceleration": 5.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, "unlimited": false } + }, + { + "name": "Middle", + "minWaypointRelativePos": 0.6389201349831248, + "maxWaypointRelativePos": 2.393700787401576, + "constraints": { + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 2.393700787401576, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } } ], "pointTowardsZones": [], @@ -153,8 +183,8 @@ } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -168,7 +198,7 @@ "folder": null, "idealStartingState": { "velocity": 0, - "rotation": 0.0 + "rotation": -0.0 }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index e552f881..82051d9a 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -8,40 +8,40 @@ }, "prevControl": null, "nextControl": { - "x": -0.26062299971986747, - "y": 8.453915723898339 + "x": 0.9, + "y": 7.7700000000000005 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.011174377224199, - "y": 7.3972479240806654 + "x": 6.95, + "y": 7.41 }, "prevControl": { - "x": 6.151014935129701, - "y": 7.43897149932958 + "x": 5.6, + "y": 7.430000000000001 }, "nextControl": { - "x": 8.049723690138467, - "y": 7.346871228451337 + "x": 7.6, + "y": 6.970000000000001 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.592170818505339, - "y": 4.761245551601424 + "x": 7.45, + "y": 4.76 }, "prevControl": { - "x": 8.399588492208746, - "y": 4.515561478408838 + "x": 7.85, + "y": 4.82 }, "nextControl": { - "x": 6.612750657635942, - "y": 5.059267185665533 + "x": 6.470579839130603, + "y": 5.05802163406411 }, "isLocked": false, "linkedName": null @@ -78,23 +78,53 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.6500888099467169, - "rotationDegrees": 1.3642985911582572 + "waypointRelativePos": 0.6, + "rotationDegrees": 0 + }, + { + "waypointRelativePos": 0.97, + "rotationDegrees": 0 } ], "constraintZones": [ { - "name": "Constraints Zone", - "minWaypointRelativePos": 1.3138357705286847, - "maxWaypointRelativePos": 2.3127109111361093, + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.232845894263218, "constraints": { - "maxVelocity": 3.0, + "maxVelocity": 2.5, "maxAcceleration": 5.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, "unlimited": false } + }, + { + "name": "Middle", + "minWaypointRelativePos": 1.232845894263218, + "maxWaypointRelativePos": 2.3757030371203673, + "constraints": { + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 2.3757030371203673, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } } ], "pointTowardsZones": [ @@ -103,7 +133,7 @@ "x": 7.0, "y": 7.57 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 0.01, "maxWaypointRelativePos": 0.2969628796400511, "name": "Point Towards Zone" @@ -113,7 +143,7 @@ "x": 8.0, "y": 2.5700000000000003 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 1.1878515185601808, "maxWaypointRelativePos": 1.545556805399325, "name": "Point Towards Zone" @@ -123,7 +153,7 @@ "x": 2.0, "y": 6.07 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 2.0, "maxWaypointRelativePos": 3.85, "name": "Point Towards Zone" @@ -166,7 +196,7 @@ { "name": "WarmupShooterNear", "waypointRelativePos": 3.25, - "endWaypointRelativePos": 2.8211473565804193, + "endWaypointRelativePos": 4.0, "command": { "type": "named", "data": { @@ -177,7 +207,7 @@ { "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", "waypointRelativePos": 3.45, - "endWaypointRelativePos": 3.0, + "endWaypointRelativePos": 4.0, "command": { "type": "named", "data": { @@ -187,8 +217,8 @@ } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index bf7143fb..3a694f64 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": -0.20824436536180269, - "y": 8.05355871886121 + "x": 0.9, + "y": 7.7700000000000005 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 4.31061684460261, - "y": 7.472562277580073 + "x": 4.31, + "y": 7.430000000000001 }, "prevControl": { - "x": 4.0606200010287745, - "y": 7.4713060120351065 + "x": 3.0, + "y": 7.430000000000001 }, "nextControl": { - "x": 6.451696322662557, - "y": 7.483321470931751 + "x": 6.0, + "y": 7.430000000000001 }, "isLocked": false, "linkedName": null @@ -79,17 +79,43 @@ "rotationTargets": [], "constraintZones": [ { - "name": "Constraints Zone", - "minWaypointRelativePos": 1.349831271091114, - "maxWaypointRelativePos": 3.032620922384704, + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.2148481439820025, "constraints": { - "maxVelocity": 3.0, + "maxVelocity": 2.5, "maxAcceleration": 5.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, "unlimited": false } + }, + { + "name": "Middle", + "minWaypointRelativePos": 1.2148481439820025, + "maxWaypointRelativePos": 3.3655793025871765, + "constraints": { + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 3.3655793025871765, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } } ], "pointTowardsZones": [ @@ -98,7 +124,7 @@ "x": 7.0, "y": 7.42 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 0.0, "maxWaypointRelativePos": 1.1203599550056242, "name": "Point Towards Zone" @@ -108,7 +134,7 @@ "x": 6.5, "y": 2.5700000000000003 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 1.53880764904387, "maxWaypointRelativePos": 1.9617547806524194, "name": "Point Towards Zone" @@ -118,7 +144,7 @@ "x": 7.0, "y": 4.57 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 1.96, "maxWaypointRelativePos": 2.474690663667043, "name": "Point Towards Zone" @@ -151,12 +177,17 @@ "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, "endWaypointRelativePos": 3.977502812148512, - "command": null + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path b/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path index 5627e5e4..044d63bf 100644 --- a/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": 4.199971548646286, - "y": 7.538197472813309 + "x": 5.3, + "y": 7.430000000000001 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.6244483985765115, - "y": 6.805492289442467 + "x": 7.5, + "y": 6.67 }, "prevControl": { - "x": 7.6997627520759195, - "y": 8.333297746144721 + "x": 6.9, + "y": 7.41 }, "nextControl": { - "x": 7.590237811407521, - "y": 6.111506092585812 + "x": 7.75, + "y": 6.12 }, "isLocked": false, "linkedName": null @@ -48,16 +48,16 @@ }, { "anchor": { - "x": 6.6130842230130495, - "y": 7.440284697508897 + "x": 6.61, + "y": 7.41 }, "prevControl": { - "x": 7.168130482156051, - "y": 7.171991722548969 + "x": 7.21, + "y": 7.398000000000001 }, "nextControl": { - "x": 6.056398333465295, - "y": 7.709370221399441 + "x": 5.6, + "y": 7.430000000000001 }, "isLocked": false, "linkedName": null @@ -78,28 +78,24 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.42628774422735244, - "rotationDegrees": -0.10827321613598044 - }, - { - "waypointRelativePos": 0.5, - "rotationDegrees": 0.0 + "waypointRelativePos": 0.55, + "rotationDegrees": 0 }, { - "waypointRelativePos": 1.0284191829484794, - "rotationDegrees": -87.7606727006398 + "waypointRelativePos": 1.03, + "rotationDegrees": -87.8 }, { - "waypointRelativePos": 1.420959147424509, - "rotationDegrees": -96.78976433613241 + "waypointRelativePos": 1.42, + "rotationDegrees": -96.8 }, { - "waypointRelativePos": 2.749555950266447, - "rotationDegrees": 179.0040765647882 + "waypointRelativePos": 2.75, + "rotationDegrees": 179 }, { "waypointRelativePos": 3.95, - "rotationDegrees": -178.97451694025509 + "rotationDegrees": -179 } ], "constraintZones": [ @@ -165,7 +161,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, @@ -180,7 +176,7 @@ "folder": null, "idealStartingState": { "velocity": 0, - "rotation": 0.0 + "rotation": -0.0 }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path b/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path index 74fa4c1e..382df771 100644 --- a/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path +++ b/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": 4.4658539826374, - "y": 7.472305933380947 + "x": 4.3, + "y": 7.45 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 6.2903084223013055, - "y": 7.364970344009492 + "x": 6.29, + "y": 7.3500000000000005 }, "prevControl": { - "x": 5.954745702065148, - "y": 7.480268753920549 + "x": 5.7, + "y": 7.430000000000001 }, "nextControl": { - "x": 7.298432337453816, - "y": 7.018581793074536 + "x": 7.298123915152511, + "y": 7.003611449065045 }, "isLocked": false, "linkedName": null @@ -44,7 +44,12 @@ "linkedName": null } ], - "rotationTargets": [], + "rotationTargets": [ + { + "waypointRelativePos": 0.8, + "rotationDegrees": 0 + } + ], "constraintZones": [], "pointTowardsZones": [ { @@ -52,7 +57,7 @@ "x": 7.0, "y": 7.32 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 0.0, "maxWaypointRelativePos": 0.4094488188976311, "name": "Point Towards Zone" @@ -83,7 +88,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index 101358ac..610155f6 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": -0.20824436536180269, - "y": 0.016441281138790398 + "x": 0.9, + "y": 0.3 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 4.31061684460261, - "y": 0.5974377224199281 + "x": 4.31, + "y": 0.64 }, "prevControl": { - "x": 4.0606200010287745, - "y": 0.598693987964894 + "x": 3.0, + "y": 0.64 }, "nextControl": { - "x": 6.451696322662557, - "y": 0.5866785290682492 + "x": 6.0, + "y": 0.64 }, "isLocked": false, "linkedName": null @@ -79,12 +79,38 @@ "rotationTargets": [], "constraintZones": [ { - "name": "Constraints Zone", + "name": "Start To Middle", + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.2148481439820025, + "constraints": { + "maxVelocity": 2.5, + "maxAcceleration": 5.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "Middle", "minWaypointRelativePos": 1.2148481439820025, "maxWaypointRelativePos": 3.3655793025871765, "constraints": { - "maxVelocity": 3.0, - "maxAcceleration": 5.0, + "maxVelocity": 1.25, + "maxAcceleration": 4.5, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + } + }, + { + "name": "After Middle", + "minWaypointRelativePos": 3.3655793025871765, + "maxWaypointRelativePos": 4.0, + "constraints": { + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, @@ -151,12 +177,17 @@ "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, "endWaypointRelativePos": 3.977502812148512, - "command": null + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } } ], "globalConstraints": { - "maxVelocity": 4.0, - "maxAcceleration": 7.0, + "maxVelocity": 5.0, + "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, "nominalVoltage": 12.0, diff --git a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path index 2e225cee..f11e0a05 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": 4.199971548646286, - "y": 0.5318025271866911 + "x": 5.3, + "y": 0.64 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.6244483985765115, - "y": 1.264507710557533 + "x": 7.5, + "y": 1.4 }, "prevControl": { - "x": 7.6997627520759195, - "y": -0.26329774614472146 + "x": 6.9, + "y": 0.66 }, "nextControl": { - "x": 7.590237811407521, - "y": 1.9584939074141878 + "x": 7.75, + "y": 1.95 }, "isLocked": false, "linkedName": null @@ -48,16 +48,16 @@ }, { "anchor": { - "x": 6.6130842230130495, - "y": 0.6297153024911029 + "x": 6.61, + "y": 0.66 }, "prevControl": { - "x": 7.168130482156051, - "y": 0.8980082774510312 + "x": 7.21, + "y": 0.672 }, "nextControl": { - "x": 6.056398333465295, - "y": 0.3606297786005597 + "x": 5.6, + "y": 0.64 }, "isLocked": false, "linkedName": null @@ -78,28 +78,24 @@ ], "rotationTargets": [ { - "waypointRelativePos": 0.42628774422735244, - "rotationDegrees": 0.10827321613598044 - }, - { - "waypointRelativePos": 0.5, - "rotationDegrees": 0.0 + "waypointRelativePos": 0.55, + "rotationDegrees": 0 }, { - "waypointRelativePos": 1.0284191829484794, - "rotationDegrees": 87.7606727006398 + "waypointRelativePos": 1.03, + "rotationDegrees": 87.8 }, { - "waypointRelativePos": 1.420959147424509, - "rotationDegrees": 96.78976433613241 + "waypointRelativePos": 1.42, + "rotationDegrees": 96.8 }, { - "waypointRelativePos": 2.749555950266447, - "rotationDegrees": -179.0040765647882 + "waypointRelativePos": 2.75, + "rotationDegrees": -179 }, { "waypointRelativePos": 3.95, - "rotationDegrees": 178.97451694025509 + "rotationDegrees": 179 } ], "constraintZones": [ @@ -165,7 +161,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, diff --git a/src/main/deploy/pathplanner/paths/RightTrenchToMid.path b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path index 1b0a19a5..2eca5ab6 100644 --- a/src/main/deploy/pathplanner/paths/RightTrenchToMid.path +++ b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path @@ -8,24 +8,24 @@ }, "prevControl": null, "nextControl": { - "x": 4.4658539826374, - "y": 0.5976940666190532 + "x": 4.3, + "y": 0.62 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 6.2903084223013055, - "y": 0.7050296559905087 + "x": 6.29, + "y": 0.72 }, "prevControl": { - "x": 5.954745702065148, - "y": 0.5897312460794514 + "x": 5.7, + "y": 0.64 }, "nextControl": { - "x": 7.298432337453816, - "y": 1.0514182069254643 + "x": 7.298123915152511, + "y": 1.0663885509349555 }, "isLocked": false, "linkedName": null @@ -44,7 +44,12 @@ "linkedName": null } ], - "rotationTargets": [], + "rotationTargets": [ + { + "waypointRelativePos": 0.8, + "rotationDegrees": 0 + } + ], "constraintZones": [], "pointTowardsZones": [ { @@ -83,7 +88,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, diff --git a/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path index 5e3cbc4f..4506792f 100644 --- a/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path @@ -16,16 +16,16 @@ }, { "anchor": { - "x": 7.602930011862398, - "y": 6.934602609727165 + "x": 7.5, + "y": 6.67 }, "prevControl": { - "x": 7.1056243047031655, - "y": 7.866358155492773 + "x": 6.9, + "y": 7.41 }, "nextControl": { - "x": 7.85996478920588, - "y": 6.4530204042614745 + "x": 7.75, + "y": 6.12 }, "isLocked": false, "linkedName": null @@ -56,8 +56,8 @@ "y": 7.47540100003204 }, "nextControl": { - "x": 4.6871886120996455, - "y": 7.70926453143535 + "x": 4.687, + "y": 7.5200000000000005 }, "isLocked": false, "linkedName": null @@ -68,8 +68,8 @@ "y": 7.247 }, "prevControl": { - "x": 5.7820656534626576, - "y": 7.595922289364782 + "x": 5.78, + "y": 7.550000000000001 }, "nextControl": null, "isLocked": false, @@ -83,7 +83,7 @@ }, { "waypointRelativePos": 0.5, - "rotationDegrees": 0.0 + "rotationDegrees": -0.0 }, { "waypointRelativePos": 1.0284191829484794, @@ -127,7 +127,7 @@ "x": 7.0, "y": 7.32 }, - "rotationOffset": 0.0, + "rotationOffset": -0.0, "minWaypointRelativePos": 0.0, "maxWaypointRelativePos": 0.3509561304836896, "name": "Point Towards Zone" @@ -202,7 +202,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, diff --git a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path index 699a656e..6586c71a 100644 --- a/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -16,16 +16,16 @@ }, { "anchor": { - "x": 7.602930011862398, - "y": 1.1353973902728354 + "x": 7.5, + "y": 1.4 }, "prevControl": { - "x": 7.1056243047031655, - "y": 0.20364184450722733 + "x": 6.9, + "y": 0.66 }, "nextControl": { - "x": 7.85996478920588, - "y": 1.6169795957385253 + "x": 7.75, + "y": 1.95 }, "isLocked": false, "linkedName": null @@ -56,8 +56,8 @@ "y": 0.5945989999679602 }, "nextControl": { - "x": 4.6871886120996455, - "y": 0.3607354685646501 + "x": 4.687, + "y": 0.55 }, "isLocked": false, "linkedName": null @@ -68,8 +68,8 @@ "y": 0.823 }, "prevControl": { - "x": 5.7820656534626576, - "y": 0.4740777106352184 + "x": 5.78, + "y": 0.52 }, "nextControl": null, "isLocked": false, @@ -202,7 +202,7 @@ } ], "globalConstraints": { - "maxVelocity": 5.0, + "maxVelocity": 3.7, "maxAcceleration": 9.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0, diff --git a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java index 24a46a5f..c6aae798 100644 --- a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java +++ b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java @@ -14,6 +14,7 @@ import competition.subsystems.collector_intake.commands.CollectorIntakeCommand; import competition.subsystems.drive.DriveSubsystem; import competition.subsystems.intake_deploy.commands.IntakeDeployExtendCommand; +import competition.subsystems.intake_deploy.commands.IntakeDeployRetractCommand; import competition.subsystems.pose.PoseSubsystem; import competition.subsystems.pose.TrajectoriesCalculation; import edu.wpi.first.wpilibj.DriverStation; @@ -26,6 +27,7 @@ public class ConfigurePathPlannerLib { @Inject public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, IntakeDeployExtendCommand intakeDeployExtendCommand, + IntakeDeployRetractCommand intakeDeployRetractCommand, CollectorIntakeCommand collectorIntakeCommand, AimAndShootFromHereCommand aimAndShootFromHereCommand, PrepareToShootCommandGroup prepareToShootCommandGroup, @@ -33,9 +35,12 @@ public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, FireWhenShooterAndHoodReady fireWhenShooterAndHoodReady ) { NamedCommands.registerCommand("IntakeDeployExtend", intakeDeployExtendCommand); + NamedCommands.registerCommand("IntakeDeployRetract", intakeDeployRetractCommand); NamedCommands.registerCommand("CollectorIntake", collectorIntakeCommand); NamedCommands.registerCommand("AimAndShootFromHere", aimAndShootFromHereCommand); NamedCommands.registerCommand("WaitForRotationAndHoodAndShooterToBeAtGoal", waitForRotationAndHoodAndShooterToBeAtGoalCommandGroup); + // The path files' event markers use this longer name. + NamedCommands.registerCommand("WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", waitForRotationAndHoodAndShooterToBeAtGoalCommandGroup); NamedCommands.registerCommand("WarmupShooterNear", prepareToShootCommandGroup.setPresetLocation(TrajectoriesCalculation.PresetShootingDistance.NEAR)); NamedCommands.registerCommand("FireWhenShooterAndHoodReady", fireWhenShooterAndHoodReady); From 948d890f2ceb6b888b08c9dbc5f519aad0adeadc Mon Sep 17 00:00:00 2001 From: Victor C Date: Sun, 25 Oct 2026 00:36:29 -0700 Subject: [PATCH 18/22] add manual retract/extend to paths --- .../autos/TwoLoopRightBumpAuto.auto | 4 +-- .../pathplanner/paths/BumpAutoFirstPath.path | 13 +++++++- .../pathplanner/paths/BumpAutoSecondPath.path | 32 ++++++++++++++++--- .../paths/LeftBumpAutoFirstPath.path | 19 ++++++++--- .../paths/LeftBumpAutoSecondPath.path | 22 +++++++++++++ .../pathplanner/paths/LeftBumpThirdCycle.path | 22 +++++++++++++ .../paths/RightBumpThirdCycle.path | 22 +++++++++++++ .../pathplanner/ConfigurePathPlannerLib.java | 12 +++++++ 8 files changed, 134 insertions(+), 12 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto index de6ede96..e3e57fd1 100644 --- a/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -17,7 +17,7 @@ { "type": "wait", "data": { - "waitTime": 3.45 + "waitTime": 3.5 } }, { @@ -42,7 +42,7 @@ { "type": "wait", "data": { - "waitTime": 3.45 + "waitTime": 3.5 } }, { diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 588d4907..7a83cef9 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -139,7 +139,7 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.5219347581552318, + "waypointRelativePos": 0.3, "endWaypointRelativePos": null, "command": { "type": "named", @@ -148,6 +148,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 0.31, + "endWaypointRelativePos": 0.87, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 0.7199100112485947, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index 5d47de04..a943fa91 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -9,7 +9,7 @@ "prevControl": null, "nextControl": { "x": 0.9, - "y": 0.3 + "y": 0.30000000000000004 }, "isLocked": false, "linkedName": null @@ -21,7 +21,7 @@ }, "prevControl": { "x": 5.6, - "y": 0.64 + "y": 0.6399999999999998 }, "nextControl": { "x": 7.6, @@ -79,17 +79,17 @@ "rotationTargets": [ { "waypointRelativePos": 0.6, - "rotationDegrees": 0 + "rotationDegrees": 0.0 }, { "waypointRelativePos": 0.97, - "rotationDegrees": 0 + "rotationDegrees": 0.0 } ], "constraintZones": [ { "name": "Start To Middle", - "minWaypointRelativePos": 0.0, + "minWaypointRelativePos": 0.5489313835770542, "maxWaypointRelativePos": 1.232845894263218, "constraints": { "maxVelocity": 2.5, @@ -171,6 +171,17 @@ } } }, + { + "name": "IntakeDeployManualRetract", + "waypointRelativePos": 0.199, + "endWaypointRelativePos": 0.623, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualRetract" + } + } + }, { "name": "IntakeDeployExtend", "waypointRelativePos": 0.7019122609673796, @@ -182,6 +193,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 0.712, + "endWaypointRelativePos": 0.985, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 0.857142857142857, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path index d8d0ff9f..f3d8f2f6 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -79,7 +79,7 @@ "rotationTargets": [ { "waypointRelativePos": 0.55, - "rotationDegrees": 0 + "rotationDegrees": 0.0 }, { "waypointRelativePos": 0.95, @@ -87,11 +87,11 @@ }, { "waypointRelativePos": 2.75, - "rotationDegrees": -180 + "rotationDegrees": -180.0 }, { "waypointRelativePos": 3.4, - "rotationDegrees": -180 + "rotationDegrees": -180.0 } ], "constraintZones": [ @@ -139,7 +139,7 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.5219347581552318, + "waypointRelativePos": 0.3, "endWaypointRelativePos": null, "command": { "type": "named", @@ -148,6 +148,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 0.31, + "endWaypointRelativePos": 0.87, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 0.7199100112485947, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index 82051d9a..8532e01a 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -171,6 +171,17 @@ } } }, + { + "name": "IntakeDeployManualRetract", + "waypointRelativePos": 0.199, + "endWaypointRelativePos": 0.522, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualRetract" + } + } + }, { "name": "IntakeDeployExtend", "waypointRelativePos": 0.7019122609673796, @@ -182,6 +193,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 0.712, + "endWaypointRelativePos": 0.985, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 0.857142857142857, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index 3a694f64..7fc8f0b9 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -162,6 +162,17 @@ } } }, + { + "name": "IntakeDeployManualRetract", + "waypointRelativePos": 0.163, + "endWaypointRelativePos": 0.772, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualRetract" + } + } + }, { "name": "IntakeDeployExtend", "waypointRelativePos": 1.151856017997751, @@ -173,6 +184,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 1.162, + "endWaypointRelativePos": 1.505, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index 610155f6..47113158 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -162,6 +162,17 @@ } } }, + { + "name": "IntakeDeployManualRetract", + "waypointRelativePos": 0.163, + "endWaypointRelativePos": 0.772, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualRetract" + } + } + }, { "name": "IntakeDeployExtend", "waypointRelativePos": 1.151856017997751, @@ -173,6 +184,17 @@ } } }, + { + "name": "IntakeDeployManualExtend", + "waypointRelativePos": 1.162, + "endWaypointRelativePos": 1.505, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployManualExtend" + } + } + }, { "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, diff --git a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java index c6aae798..89364fcd 100644 --- a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java +++ b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java @@ -14,6 +14,7 @@ import competition.subsystems.collector_intake.commands.CollectorIntakeCommand; import competition.subsystems.drive.DriveSubsystem; import competition.subsystems.intake_deploy.commands.IntakeDeployExtendCommand; +import competition.subsystems.intake_deploy.commands.IntakeDeployExtendWithoutPidCommand; import competition.subsystems.intake_deploy.commands.IntakeDeployRetractCommand; import competition.subsystems.pose.PoseSubsystem; import competition.subsystems.pose.TrajectoriesCalculation; @@ -24,10 +25,14 @@ public class ConfigurePathPlannerLib { + private static final double manualIntakeDeployTimeoutSeconds = 1.5; + @Inject public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, IntakeDeployExtendCommand intakeDeployExtendCommand, IntakeDeployRetractCommand intakeDeployRetractCommand, + IntakeDeployExtendWithoutPidCommand intakeDeployManualExtendCommand, + IntakeDeployExtendWithoutPidCommand intakeDeployManualRetractCommand, CollectorIntakeCommand collectorIntakeCommand, AimAndShootFromHereCommand aimAndShootFromHereCommand, PrepareToShootCommandGroup prepareToShootCommandGroup, @@ -36,6 +41,13 @@ public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, ) { NamedCommands.registerCommand("IntakeDeployExtend", intakeDeployExtendCommand); NamedCommands.registerCommand("IntakeDeployRetract", intakeDeployRetractCommand); + // Same as the operator holding the left stick fully down/up (the maintainer's manual control calls + // setPower with the stick value). These run until cancelled, so use them as zoned event markers; + // the timeout is only a safety net. + NamedCommands.registerCommand("IntakeDeployManualExtend", + intakeDeployManualExtendCommand.setPower(() -> -1.0).withTimeout(manualIntakeDeployTimeoutSeconds)); + NamedCommands.registerCommand("IntakeDeployManualRetract", + intakeDeployManualRetractCommand.setPower(() -> 1.0).withTimeout(manualIntakeDeployTimeoutSeconds)); NamedCommands.registerCommand("CollectorIntake", collectorIntakeCommand); NamedCommands.registerCommand("AimAndShootFromHere", aimAndShootFromHereCommand); NamedCommands.registerCommand("WaitForRotationAndHoodAndShooterToBeAtGoal", waitForRotationAndHoodAndShooterToBeAtGoalCommandGroup); From 1eb7d0cd7ea0aa6bb5f06d64ed5492a594b51171 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sun, 25 Oct 2026 08:51:09 -0700 Subject: [PATCH 19/22] revert latest commit --- .../pathplanner/paths/BumpAutoFirstPath.path | 13 +---------- .../pathplanner/paths/BumpAutoSecondPath.path | 22 ------------------- .../paths/LeftBumpAutoFirstPath.path | 19 ++++------------ .../paths/LeftBumpAutoSecondPath.path | 22 ------------------- .../pathplanner/paths/LeftBumpThirdCycle.path | 22 ------------------- .../paths/RightBumpThirdCycle.path | 22 ------------------- .../pathplanner/ConfigurePathPlannerLib.java | 12 ---------- 7 files changed, 5 insertions(+), 127 deletions(-) diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 7a83cef9..588d4907 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -139,7 +139,7 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.3, + "waypointRelativePos": 0.5219347581552318, "endWaypointRelativePos": null, "command": { "type": "named", @@ -148,17 +148,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 0.31, - "endWaypointRelativePos": 0.87, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 0.7199100112485947, diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index a943fa91..d6096598 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -171,17 +171,6 @@ } } }, - { - "name": "IntakeDeployManualRetract", - "waypointRelativePos": 0.199, - "endWaypointRelativePos": 0.623, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualRetract" - } - } - }, { "name": "IntakeDeployExtend", "waypointRelativePos": 0.7019122609673796, @@ -193,17 +182,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 0.712, - "endWaypointRelativePos": 0.985, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 0.857142857142857, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path index f3d8f2f6..d8d0ff9f 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -79,7 +79,7 @@ "rotationTargets": [ { "waypointRelativePos": 0.55, - "rotationDegrees": 0.0 + "rotationDegrees": 0 }, { "waypointRelativePos": 0.95, @@ -87,11 +87,11 @@ }, { "waypointRelativePos": 2.75, - "rotationDegrees": -180.0 + "rotationDegrees": -180 }, { "waypointRelativePos": 3.4, - "rotationDegrees": -180.0 + "rotationDegrees": -180 } ], "constraintZones": [ @@ -139,7 +139,7 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.3, + "waypointRelativePos": 0.5219347581552318, "endWaypointRelativePos": null, "command": { "type": "named", @@ -148,17 +148,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 0.31, - "endWaypointRelativePos": 0.87, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 0.7199100112485947, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index 8532e01a..82051d9a 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -171,17 +171,6 @@ } } }, - { - "name": "IntakeDeployManualRetract", - "waypointRelativePos": 0.199, - "endWaypointRelativePos": 0.522, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualRetract" - } - } - }, { "name": "IntakeDeployExtend", "waypointRelativePos": 0.7019122609673796, @@ -193,17 +182,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 0.712, - "endWaypointRelativePos": 0.985, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 0.857142857142857, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index 7fc8f0b9..3a694f64 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -162,17 +162,6 @@ } } }, - { - "name": "IntakeDeployManualRetract", - "waypointRelativePos": 0.163, - "endWaypointRelativePos": 0.772, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualRetract" - } - } - }, { "name": "IntakeDeployExtend", "waypointRelativePos": 1.151856017997751, @@ -184,17 +173,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 1.162, - "endWaypointRelativePos": 1.505, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index 47113158..610155f6 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -162,17 +162,6 @@ } } }, - { - "name": "IntakeDeployManualRetract", - "waypointRelativePos": 0.163, - "endWaypointRelativePos": 0.772, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualRetract" - } - } - }, { "name": "IntakeDeployExtend", "waypointRelativePos": 1.151856017997751, @@ -184,17 +173,6 @@ } } }, - { - "name": "IntakeDeployManualExtend", - "waypointRelativePos": 1.162, - "endWaypointRelativePos": 1.505, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployManualExtend" - } - } - }, { "name": "CollectorIntake", "waypointRelativePos": 1.2418447694038248, diff --git a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java index 89364fcd..c6aae798 100644 --- a/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java +++ b/src/main/java/competition/auto/pathplanner/ConfigurePathPlannerLib.java @@ -14,7 +14,6 @@ import competition.subsystems.collector_intake.commands.CollectorIntakeCommand; import competition.subsystems.drive.DriveSubsystem; import competition.subsystems.intake_deploy.commands.IntakeDeployExtendCommand; -import competition.subsystems.intake_deploy.commands.IntakeDeployExtendWithoutPidCommand; import competition.subsystems.intake_deploy.commands.IntakeDeployRetractCommand; import competition.subsystems.pose.PoseSubsystem; import competition.subsystems.pose.TrajectoriesCalculation; @@ -25,14 +24,10 @@ public class ConfigurePathPlannerLib { - private static final double manualIntakeDeployTimeoutSeconds = 1.5; - @Inject public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, IntakeDeployExtendCommand intakeDeployExtendCommand, IntakeDeployRetractCommand intakeDeployRetractCommand, - IntakeDeployExtendWithoutPidCommand intakeDeployManualExtendCommand, - IntakeDeployExtendWithoutPidCommand intakeDeployManualRetractCommand, CollectorIntakeCommand collectorIntakeCommand, AimAndShootFromHereCommand aimAndShootFromHereCommand, PrepareToShootCommandGroup prepareToShootCommandGroup, @@ -41,13 +36,6 @@ public ConfigurePathPlannerLib(PoseSubsystem pose, DriveSubsystem drive, ) { NamedCommands.registerCommand("IntakeDeployExtend", intakeDeployExtendCommand); NamedCommands.registerCommand("IntakeDeployRetract", intakeDeployRetractCommand); - // Same as the operator holding the left stick fully down/up (the maintainer's manual control calls - // setPower with the stick value). These run until cancelled, so use them as zoned event markers; - // the timeout is only a safety net. - NamedCommands.registerCommand("IntakeDeployManualExtend", - intakeDeployManualExtendCommand.setPower(() -> -1.0).withTimeout(manualIntakeDeployTimeoutSeconds)); - NamedCommands.registerCommand("IntakeDeployManualRetract", - intakeDeployManualRetractCommand.setPower(() -> 1.0).withTimeout(manualIntakeDeployTimeoutSeconds)); NamedCommands.registerCommand("CollectorIntake", collectorIntakeCommand); NamedCommands.registerCommand("AimAndShootFromHere", aimAndShootFromHereCommand); NamedCommands.registerCommand("WaitForRotationAndHoodAndShooterToBeAtGoal", waitForRotationAndHoodAndShooterToBeAtGoalCommandGroup); From 009497a785b90a914fed76ad5f145b26a45ad3d9 Mon Sep 17 00:00:00 2001 From: Victor C Date: Sun, 25 Oct 2026 12:44:10 -0700 Subject: [PATCH 20/22] stop the collector from trying to intake fuel before intake is fully deployed --- .../pathplanner/paths/BumpAutoFirstPath.path | 27 +++++++++---- .../pathplanner/paths/BumpAutoSecondPath.path | 32 ++++++++-------- .../paths/LeftBumpAutoFirstPath.path | 21 ++++++++-- .../paths/LeftBumpAutoSecondPath.path | 36 +++++++++--------- .../pathplanner/paths/LeftBumpThirdCycle.path | 34 +++++++++-------- .../paths/RightBumpThirdCycle.path | 38 ++++++++++--------- .../intake_deploy/IntakeDeploySubsystem.java | 4 +- 7 files changed, 113 insertions(+), 79 deletions(-) diff --git a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path index 588d4907..50115401 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -79,7 +79,7 @@ "rotationTargets": [ { "waypointRelativePos": 0.55, - "rotationDegrees": 0 + "rotationDegrees": 0.0 }, { "waypointRelativePos": 0.95, @@ -87,11 +87,11 @@ }, { "waypointRelativePos": 2.75, - "rotationDegrees": 180 + "rotationDegrees": 180.0 }, { "waypointRelativePos": 3.4, - "rotationDegrees": 180 + "rotationDegrees": 180.0 } ], "constraintZones": [ @@ -139,18 +139,31 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.5219347581552318, + "waypointRelativePos": 0.26096737907761586, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 0.7199100112485947, + "waypointRelativePos": 0.9268841394825689, "endWaypointRelativePos": 2.6906636670416195, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index d6096598..5df249a4 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -160,31 +160,33 @@ } ], "eventMarkers": [ - { - "name": "IntakeDeployRetract", - "waypointRelativePos": 0.18897637795275782, - "endWaypointRelativePos": null, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployRetract" - } - } - }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.7019122609673796, + "waypointRelativePos": 0.37795275590551486, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 0.857142857142857, + "waypointRelativePos": 1.077, "endWaypointRelativePos": 2.4836895388076488, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path index d8d0ff9f..29e7fe72 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -139,18 +139,31 @@ "eventMarkers": [ { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.5219347581552318, + "waypointRelativePos": 0.1709786276715406, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 0.7199100112485947, + "waypointRelativePos": 0.9268841394825689, "endWaypointRelativePos": 2.6906636670416195, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index 82051d9a..b9cfc9e7 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -79,11 +79,11 @@ "rotationTargets": [ { "waypointRelativePos": 0.6, - "rotationDegrees": 0 + "rotationDegrees": 0.0 }, { "waypointRelativePos": 0.97, - "rotationDegrees": 0 + "rotationDegrees": 0.0 } ], "constraintZones": [ @@ -160,31 +160,33 @@ } ], "eventMarkers": [ - { - "name": "IntakeDeployRetract", - "waypointRelativePos": 0.18897637795275782, - "endWaypointRelativePos": null, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployRetract" - } - } - }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 0.7019122609673796, + "waypointRelativePos": 0.4229471316085451, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 0.857142857142857, + "waypointRelativePos": 1.077, "endWaypointRelativePos": 2.4836895388076488, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index 3a694f64..f940143c 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -8,7 +8,7 @@ }, "prevControl": null, "nextControl": { - "x": 0.9, + "x": 0.9000000000000001, "y": 7.7700000000000005 }, "isLocked": false, @@ -151,31 +151,33 @@ } ], "eventMarkers": [ - { - "name": "IntakeDeployRetract", - "waypointRelativePos": 0.15298087739032834, - "endWaypointRelativePos": null, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployRetract" - } - } - }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 1.151856017997751, + "waypointRelativePos": 0.63, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 1.2418447694038248, + "waypointRelativePos": 1.718785151856022, "endWaypointRelativePos": 3.977502812148512, "command": { "type": "named", diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index 610155f6..f71b0a2c 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 0.9, - "y": 0.3 + "x": 0.8999999999999997, + "y": 0.3000000000000005 }, "isLocked": false, "linkedName": null @@ -21,7 +21,7 @@ }, "prevControl": { "x": 3.0, - "y": 0.64 + "y": 0.6400000000000001 }, "nextControl": { "x": 6.0, @@ -151,31 +151,33 @@ } ], "eventMarkers": [ - { - "name": "IntakeDeployRetract", - "waypointRelativePos": 0.15298087739032834, - "endWaypointRelativePos": null, - "command": { - "type": "named", - "data": { - "name": "IntakeDeployRetract" - } - } - }, { "name": "IntakeDeployExtend", - "waypointRelativePos": 1.151856017997751, + "waypointRelativePos": 0.6299212598425135, "endWaypointRelativePos": null, "command": { - "type": "named", + "type": "deadline", "data": { - "name": "IntakeDeployExtend" + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] } } }, { "name": "CollectorIntake", - "waypointRelativePos": 1.2418447694038248, + "waypointRelativePos": 1.718785151856022, "endWaypointRelativePos": 3.977502812148512, "command": { "type": "named", diff --git a/src/main/java/competition/subsystems/intake_deploy/IntakeDeploySubsystem.java b/src/main/java/competition/subsystems/intake_deploy/IntakeDeploySubsystem.java index d99ac8ad..2b9cf264 100644 --- a/src/main/java/competition/subsystems/intake_deploy/IntakeDeploySubsystem.java +++ b/src/main/java/competition/subsystems/intake_deploy/IntakeDeploySubsystem.java @@ -81,8 +81,8 @@ public IntakeDeploySubsystem(XCANMotorController.XCANMotorControllerFactory xcan this.intakeDeployEncoder = null; } - this.retractedPosition = propertyFactory.createPersistentProperty("RetractedPosition", -10.0); - this.extendedPosition = propertyFactory.createPersistentProperty("ExtendedPosition", -145.0); + this.retractedPosition = propertyFactory.createPersistentProperty("RetractedPosition", -70.0); + this.extendedPosition = propertyFactory.createPersistentProperty("ExtendedPosition", -205.0); this.manualControlPower = propertyFactory.createPersistentProperty("ManualControlPower", 0.2); From a6cfb4f5787de4d0629d7145aeebf1341fc43a9f Mon Sep 17 00:00:00 2001 From: Victor C Date: Tue, 27 Oct 2026 20:46:17 -0700 Subject: [PATCH 21/22] make second loop wider to try and prevent intake from hitting trench --- src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path | 6 +++--- .../deploy/pathplanner/paths/LeftBumpAutoSecondPath.path | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path index 5df249a4..45c9f590 100644 --- a/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 0.9, - "y": 0.30000000000000004 + "x": -0.7568187233993817, + "y": 0.21020559088949398 }, "isLocked": false, "linkedName": null @@ -89,7 +89,7 @@ "constraintZones": [ { "name": "Start To Middle", - "minWaypointRelativePos": 0.5489313835770542, + "minWaypointRelativePos": 0.557930258717661, "maxWaypointRelativePos": 1.232845894263218, "constraints": { "maxVelocity": 2.5, diff --git a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path index b9cfc9e7..1592de0b 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 0.9, - "y": 7.7700000000000005 + "x": -0.42342823250296524, + "y": 7.687746144721235 }, "isLocked": false, "linkedName": null @@ -89,7 +89,7 @@ "constraintZones": [ { "name": "Start To Middle", - "minWaypointRelativePos": 0.0, + "minWaypointRelativePos": 0.56, "maxWaypointRelativePos": 1.232845894263218, "constraints": { "maxVelocity": 2.5, From d64c95953aa7644c1113b1cc09a72dc5cc900d30 Mon Sep 17 00:00:00 2001 From: Victor C Date: Tue, 27 Oct 2026 22:47:51 -0700 Subject: [PATCH 22/22] make third cycle wider --- src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path | 8 ++++---- .../deploy/pathplanner/paths/RightBumpThirdCycle.path | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path index f940143c..e832aa8e 100644 --- a/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -24,7 +24,7 @@ "y": 7.430000000000001 }, "nextControl": { - "x": 6.0, + "x": 7.3, "y": 7.430000000000001 }, "isLocked": false, @@ -36,8 +36,8 @@ "y": 4.933392645314354 }, "prevControl": { - "x": 6.225753262164336, - "y": 6.525753262153578 + "x": 6.205646, + "y": 7.27 }, "nextControl": { "x": 6.29666271627912, @@ -126,7 +126,7 @@ }, "rotationOffset": -0.0, "minWaypointRelativePos": 0.0, - "maxWaypointRelativePos": 1.1203599550056242, + "maxWaypointRelativePos": 1.1248593925759287, "name": "Point Towards Zone" }, { diff --git a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path index f71b0a2c..b70b5370 100644 --- a/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -24,7 +24,7 @@ "y": 0.6400000000000001 }, "nextControl": { - "x": 6.0, + "x": 7.3, "y": 0.64 }, "isLocked": false, @@ -36,8 +36,8 @@ "y": 3.1366073546856454 }, "prevControl": { - "x": 6.225753262164336, - "y": 1.5442467378464222 + "x": 6.205646, + "y": 0.8000000000000003 }, "nextControl": { "x": 6.29666271627912, @@ -126,7 +126,7 @@ }, "rotationOffset": 0.0, "minWaypointRelativePos": 0.0, - "maxWaypointRelativePos": 1.1203599550056242, + "maxWaypointRelativePos": 1.1338582677165354, "name": "Point Towards Zone" }, {