diff --git a/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopLeftBumpAuto.auto new file mode 100644 index 00000000..d19a13e6 --- /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.45 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "LeftBumpAutoSecondPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.45 + } + }, + { + "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/autos/TwoLoopRightBumpAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto new file mode 100644 index 00000000..e3e57fd1 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightBumpAuto.auto @@ -0,0 +1,69 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "BumpAutoFirstPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.5 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "BumpAutoSecondPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.5 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "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/TwoLoopRightTrenchAuto.auto b/src/main/deploy/pathplanner/autos/TwoLoopRightTrenchAuto.auto new file mode 100644 index 00000000..7cc3ae26 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/TwoLoopRightTrenchAuto.auto @@ -0,0 +1,69 @@ +{ + "version": "2025.0", + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "RightTrenchMidPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "SecondRightTrenchMidPath" + } + }, + { + "type": "deadline", + "data": { + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.75 + } + }, + { + "type": "named", + "data": { + "name": "AimAndShootFromHere" + } + } + ] + } + }, + { + "type": "path", + "data": { + "pathName": "RightTrenchToMid" + } + } + ] + } + }, + "resetOdom": true, + "folder": null, + "choreoAuto": false +} \ No newline at end of file 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 new file mode 100644 index 00000000..50115401 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/BumpAutoFirstPath.path @@ -0,0 +1,217 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.3644128113879015, + "y": 0.6189561091340454 + }, + "prevControl": null, + "nextControl": { + "x": 5.3, + "y": 0.64 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6, + "y": 1.65 + }, + "prevControl": { + "x": 6.9, + "y": 0.7 + }, + "nextControl": { + "x": 7.85, + "y": 2.05 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6, + "y": 3.16 + }, + "prevControl": { + "x": 7.95, + "y": 3.05 + }, + "nextControl": { + "x": 6.749665173069584, + "y": 3.3992682957638296 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.397295373665481, + "y": 2.5556109134045073 + }, + "prevControl": { + "x": 6.075049809208657, + "y": 2.570344705481533 + }, + "nextControl": { + "x": 3.91252669039146, + "y": 2.5233333333333325 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 1.5562633451957297, + "y": 1.7917081850533805 + }, + "prevControl": { + "x": 2.5783867141162524, + "y": 2.4265005931198096 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.55, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 0.95, + "rotationDegrees": 60.5 + }, + { + "waypointRelativePos": 2.75, + "rotationDegrees": 180.0 + }, + { + "waypointRelativePos": 3.4, + "rotationDegrees": 180.0 + } + ], + "constraintZones": [ + { + "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": 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": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.26096737907761586, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9268841394825689, + "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/BumpAutoSecondPath.path b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path new file mode 100644 index 00000000..45c9f590 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/BumpAutoSecondPath.path @@ -0,0 +1,240 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.556, + "y": 1.792 + }, + "prevControl": null, + "nextControl": { + "x": -0.7568187233993817, + "y": 0.21020559088949398 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.95, + "y": 0.66 + }, + "prevControl": { + "x": 5.6, + "y": 0.6399999999999998 + }, + "nextControl": { + "x": 7.6, + "y": 1.1 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.45, + "y": 3.31 + }, + "prevControl": { + "x": 7.85, + "y": 3.25 + }, + "nextControl": { + "x": 6.470579839130603, + "y": 3.011978365935891 + }, + "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 + }, + { + "anchor": { + "x": 1.9866310794780553, + "y": 1.910059311981021 + }, + "prevControl": { + "x": 2.8727701115753925, + "y": 2.567344505132228 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.6, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 0.97, + "rotationDegrees": 0.0 + } + ], + "constraintZones": [ + { + "name": "Start To Middle", + "minWaypointRelativePos": 0.557930258717661, + "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": 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": [ + { + "fieldPosition": { + "x": 7.0, + "y": 0.5 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.01, + "maxWaypointRelativePos": 0.2969628796400511, + "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.0, + "maxWaypointRelativePos": 3.85, + "name": "Point Towards Zone" + } + ], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.37795275590551486, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.077, + "endWaypointRelativePos": 2.4836895388076488, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.25, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.45, + "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": -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/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/LeftBumpAutoFirstPath.path b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path new file mode 100644 index 00000000..29e7fe72 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoFirstPath.path @@ -0,0 +1,217 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.3644128113879015, + "y": 7.451043890865955 + }, + "prevControl": null, + "nextControl": { + "x": 5.3, + "y": 7.430000000000001 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6, + "y": 6.42 + }, + "prevControl": { + "x": 6.9, + "y": 7.37 + }, + "nextControl": { + "x": 7.85, + "y": 6.0200000000000005 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.6, + "y": 4.91 + }, + "prevControl": { + "x": 7.95, + "y": 5.0200000000000005 + }, + "nextControl": { + "x": 6.749665173069584, + "y": 4.670731704236171 + }, + "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.55, + "rotationDegrees": 0 + }, + { + "waypointRelativePos": 0.95, + "rotationDegrees": -60.5 + }, + { + "waypointRelativePos": 2.75, + "rotationDegrees": -180 + }, + { + "waypointRelativePos": 3.4, + "rotationDegrees": -180 + } + ], + "constraintZones": [ + { + "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": 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": [], + "eventMarkers": [ + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 0.1709786276715406, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 0.9268841394825689, + "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..1592de0b --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpAutoSecondPath.path @@ -0,0 +1,240 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.556, + "y": 6.2780000000000005 + }, + "prevControl": null, + "nextControl": { + "x": -0.42342823250296524, + "y": 7.687746144721235 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.95, + "y": 7.41 + }, + "prevControl": { + "x": 5.6, + "y": 7.430000000000001 + }, + "nextControl": { + "x": 7.6, + "y": 6.970000000000001 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.45, + "y": 4.76 + }, + "prevControl": { + "x": 7.85, + "y": 4.82 + }, + "nextControl": { + "x": 6.470579839130603, + "y": 5.05802163406411 + }, + "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.6, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 0.97, + "rotationDegrees": 0.0 + } + ], + "constraintZones": [ + { + "name": "Start To Middle", + "minWaypointRelativePos": 0.56, + "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": 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": [ + { + "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": "IntakeDeployExtend", + "waypointRelativePos": 0.4229471316085451, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.077, + "endWaypointRelativePos": 2.4836895388076488, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + }, + { + "name": "WarmupShooterNear", + "waypointRelativePos": 3.25, + "endWaypointRelativePos": 4.0, + "command": { + "type": "named", + "data": { + "name": "WarmupShooterNear" + } + } + }, + { + "name": "WaitForRotationAndHoodAndShooterToBeAtGoalCommandGroup", + "waypointRelativePos": 3.45, + "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": 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..e832aa8e --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftBumpThirdCycle.path @@ -0,0 +1,209 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.987, + "y": 6.16 + }, + "prevControl": null, + "nextControl": { + "x": 0.9000000000000001, + "y": 7.7700000000000005 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 4.31, + "y": 7.430000000000001 + }, + "prevControl": { + "x": 3.0, + "y": 7.430000000000001 + }, + "nextControl": { + "x": 7.3, + "y": 7.430000000000001 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.26879003558719, + "y": 4.933392645314354 + }, + "prevControl": { + "x": 6.205646, + "y": 7.27 + }, + "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": [ + { + "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": 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": [ + { + "fieldPosition": { + "x": 7.0, + "y": 7.42 + }, + "rotationOffset": -0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.1248593925759287, + "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": "IntakeDeployExtend", + "waypointRelativePos": 0.63, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.718785151856022, + "endWaypointRelativePos": 3.977502812148512, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + } + ], + "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..044d63bf --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftTrenchMidPath.path @@ -0,0 +1,182 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.43, + "y": 7.440284697508897 + }, + "prevControl": null, + "nextControl": { + "x": 5.3, + "y": 7.430000000000001 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.5, + "y": 6.67 + }, + "prevControl": { + "x": 6.9, + "y": 7.41 + }, + "nextControl": { + "x": 7.75, + "y": 6.12 + }, + "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.61, + "y": 7.41 + }, + "prevControl": { + "x": 7.21, + "y": 7.398000000000001 + }, + "nextControl": { + "x": 5.6, + "y": 7.430000000000001 + }, + "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.55, + "rotationDegrees": 0 + }, + { + "waypointRelativePos": 1.03, + "rotationDegrees": -87.8 + }, + { + "waypointRelativePos": 1.42, + "rotationDegrees": -96.8 + }, + { + "waypointRelativePos": 2.75, + "rotationDegrees": 179 + }, + { + "waypointRelativePos": 3.95, + "rotationDegrees": -179 + } + ], + "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": 3.7, + "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..382df771 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/LeftTrenchToMid.path @@ -0,0 +1,109 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 7.247 + }, + "prevControl": null, + "nextControl": { + "x": 4.3, + "y": 7.45 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.29, + "y": 7.3500000000000005 + }, + "prevControl": { + "x": 5.7, + "y": 7.430000000000001 + }, + "nextControl": { + "x": 7.298123915152511, + "y": 7.003611449065045 + }, + "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": [ + { + "waypointRelativePos": 0.8, + "rotationDegrees": 0 + } + ], + "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": 3.7, + "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/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..b70b5370 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightBumpThirdCycle.path @@ -0,0 +1,209 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 1.987, + "y": 1.91 + }, + "prevControl": null, + "nextControl": { + "x": 0.8999999999999997, + "y": 0.3000000000000005 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 4.31, + "y": 0.64 + }, + "prevControl": { + "x": 3.0, + "y": 0.6400000000000001 + }, + "nextControl": { + "x": 7.3, + "y": 0.64 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.26879003558719, + "y": 3.1366073546856454 + }, + "prevControl": { + "x": 6.205646, + "y": 0.8000000000000003 + }, + "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": [ + { + "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": 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": [ + { + "fieldPosition": { + "x": 7.0, + "y": 0.65 + }, + "rotationOffset": 0.0, + "minWaypointRelativePos": 0.0, + "maxWaypointRelativePos": 1.1338582677165354, + "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": "IntakeDeployExtend", + "waypointRelativePos": 0.6299212598425135, + "endWaypointRelativePos": null, + "command": { + "type": "deadline", + "data": { + "commands": [ + { + "type": "named", + "data": { + "name": "IntakeDeployExtend" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + } + ] + } + } + }, + { + "name": "CollectorIntake", + "waypointRelativePos": 1.718785151856022, + "endWaypointRelativePos": 3.977502812148512, + "command": { + "type": "named", + "data": { + "name": "CollectorIntake" + } + } + } + ], + "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/RightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path new file mode 100644 index 00000000..f11e0a05 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchMidPath.path @@ -0,0 +1,182 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 4.43, + "y": 0.6297153024911029 + }, + "prevControl": null, + "nextControl": { + "x": 5.3, + "y": 0.64 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.5, + "y": 1.4 + }, + "prevControl": { + "x": 6.9, + "y": 0.66 + }, + "nextControl": { + "x": 7.75, + "y": 1.95 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 3.2872360616844607 + }, + "prevControl": { + "x": 7.37146358665783, + "y": 3.5153220713072177 + }, + "nextControl": { + "x": 8.04444218598517, + "y": 2.0156850598924994 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.61, + "y": 0.66 + }, + "prevControl": { + "x": 7.21, + "y": 0.672 + }, + "nextControl": { + "x": 5.6, + "y": 0.64 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.460640569395019, + "y": 0.7695848161274785 + }, + "prevControl": { + "x": 5.0422419928825635, + "y": 0.45756820877279436 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.55, + "rotationDegrees": 0 + }, + { + "waypointRelativePos": 1.03, + "rotationDegrees": 87.8 + }, + { + "waypointRelativePos": 1.42, + "rotationDegrees": 96.8 + }, + { + "waypointRelativePos": 2.75, + "rotationDegrees": -179 + }, + { + "waypointRelativePos": 3.95, + "rotationDegrees": 179 + } + ], + "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": 3.7, + "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/RightTrenchSecondCyclePath.path b/src/main/deploy/pathplanner/paths/RightTrenchSecondCyclePath.path new file mode 100644 index 00000000..853040a8 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchSecondCyclePath.path @@ -0,0 +1,179 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 2.621, + "y": 1.017 + }, + "prevControl": null, + "nextControl": { + "x": 2.965717674970344, + "y": 0.4898457888493476 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 5.3650177935943075, + "y": 0.5974377224199281 + }, + "prevControl": { + "x": 5.027900002678282, + "y": 0.7105961417483841 + }, + "nextControl": { + "x": 6.903582443653619, + "y": 0.08099644128113825 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.914946619217083, + "y": 3.2764768683274017 + }, + "prevControl": { + "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, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.8596802841918258, + "rotationDegrees": 0.0 + }, + { + "waypointRelativePos": 1.433392539964479, + "rotationDegrees": 38.54310882017101 + }, + { + "waypointRelativePos": 1.7850799289520412, + "rotationDegrees": 83.67481843688257 + }, + { + "waypointRelativePos": 3.1, + "rotationDegrees": -130.24 + }, + { + "waypointRelativePos": 3.65, + "rotationDegrees": -130.24082409794818 + } + ], + "constraintZones": [], + "pointTowardsZones": [], + "eventMarkers": [ + { + "name": "IntakeDeployRetract", + "waypointRelativePos": 0.22947131608548418, + "endWaypointRelativePos": null, + "command": { + "type": "named", + "data": { + "name": "IntakeDeployRetract" + } + } + }, + { + "name": "IntakeDeployExtend", + "waypointRelativePos": 1.2688413948256476, + "endWaypointRelativePos": 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": 5.0, + "maxAcceleration": 9.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0, + "nominalVoltage": 12.0, + "unlimited": false + }, + "goalEndState": { + "velocity": 0, + "rotation": -137.72631099390622 + }, + "reversed": false, + "folder": null, + "idealStartingState": { + "velocity": 0, + "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..2eca5ab6 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/RightTrenchToMid.path @@ -0,0 +1,109 @@ +{ + "version": "2025.0", + "waypoints": [ + { + "anchor": { + "x": 3.514, + "y": 0.823 + }, + "prevControl": null, + "nextControl": { + "x": 4.3, + "y": 0.62 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.29, + "y": 0.72 + }, + "prevControl": { + "x": 5.7, + "y": 0.64 + }, + "nextControl": { + "x": 7.298123915152511, + "y": 1.0663885509349555 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.4307829181494665, + "y": 1.1676749703440101 + }, + "prevControl": { + "x": 6.764789446774394, + "y": 0.860680171754671 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [ + { + "waypointRelativePos": 0.8, + "rotationDegrees": 0 + } + ], + "constraintZones": [], + "pointTowardsZones": [ + { + "fieldPosition": { + "x": 7.0, + "y": 0.75 + }, + "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": 3.7, + "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/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/paths/SecondLeftTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondLeftTrenchMidPath.path new file mode 100644 index 00000000..4506792f --- /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.5, + "y": 6.67 + }, + "prevControl": { + "x": 6.9, + "y": 7.41 + }, + "nextControl": { + "x": 7.75, + "y": 6.12 + }, + "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.687, + "y": 7.5200000000000005 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.514, + "y": 7.247 + }, + "prevControl": { + "x": 5.78, + "y": 7.550000000000001 + }, + "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": 3.7, + "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/deploy/pathplanner/paths/SecondRightTrenchMidPath.path b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path new file mode 100644 index 00000000..6586c71a --- /dev/null +++ b/src/main/deploy/pathplanner/paths/SecondRightTrenchMidPath.path @@ -0,0 +1,223 @@ +{ + "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.5, + "y": 1.4 + }, + "prevControl": { + "x": 6.9, + "y": 0.66 + }, + "nextControl": { + "x": 7.75, + "y": 1.95 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 7.473819691577701, + "y": 3.2872360616844607 + }, + "prevControl": { + "x": 7.3948579297193335, + "y": 3.5244385915281 + }, + "nextControl": { + "x": 8.063462794625597, + "y": 1.5159377464481647 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 6.570047449584817, + "y": 0.554400948991697 + }, + "prevControl": { + "x": 6.960861834076264, + "y": 0.5945989999679602 + }, + "nextControl": { + "x": 4.687, + "y": 0.55 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 3.514, + "y": 0.823 + }, + "prevControl": { + "x": 5.78, + "y": 0.52 + }, + "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": 0.75 + }, + "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": 3.7, + "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/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/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); 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/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/TwoLoopRightTrenchAuto.java b/src/main/java/competition/auto/pathplanner/TwoLoopRightTrenchAuto.java new file mode 100644 index 00000000..2d63fefc --- /dev/null +++ b/src/main/java/competition/auto/pathplanner/TwoLoopRightTrenchAuto.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 TwoLoopRightTrenchAuto extends BaseAutonomousSequentialCommandGroup { + @Inject + public TwoLoopRightTrenchAuto( + AutonomousCommandSelector autoSelector, + PropertyFactory pf + ) { + super(autoSelector); + pf.setPrefix(this.getName()); + + 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 189fe07b..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); @@ -217,6 +221,22 @@ public void setupAutoCommands(Provider setAutonomousComman var normalBumpAutoRight = setAutonomousCommandProvider.get(); normalBumpAutoRight.setAutoCommand(AutoBuilder.buildAuto("NormalBumpAutoRight")); normalBumpAutoRight.includeOnSmartDashboard("Normal Bump Auto Right"); + + var twoLoopRightTrenchAuto = setAutonomousCommandProvider.get(); + 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 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);