diff --git a/src/main/deploy/pathplanner/autos/3-Note (Amp) A45.auto b/src/main/deploy/pathplanner/autos/3-Note (Amp) A45.auto new file mode 100644 index 00000000..b6b627af --- /dev/null +++ b/src/main/deploy/pathplanner/autos/3-Note (Amp) A45.auto @@ -0,0 +1,125 @@ +{ + "version": 1.0, + "startingPose": { + "position": { + "x": 1.35, + "y": 6.5 + }, + "rotation": 0.0 + }, + "command": { + "type": "sequential", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "Between A-C to Between 2-3" + } + }, + { + "type": "named", + "data": { + "name": "Score from Between 2 and 3" + } + }, + { + "type": "parallel", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "Between 2-3 to 4" + } + }, + { + "type": "named", + "data": { + "name": "Intake Piece" + } + } + ] + } + }, + { + "type": "parallel", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "4 to Between 2-3" + } + }, + { + "type": "named", + "data": { + "name": "Prepare to Score from Between 2 and 3" + } + } + ] + } + }, + { + "type": "named", + "data": { + "name": "Score from Between 2 and 3" + } + }, + { + "type": "parallel", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "Between 2-3 to 5" + } + }, + { + "type": "named", + "data": { + "name": "Intake Piece" + } + } + ] + } + }, + { + "type": "parallel", + "data": { + "commands": [ + { + "type": "path", + "data": { + "pathName": "5 to Between 2-3" + } + }, + { + "type": "named", + "data": { + "name": "Prepare to Score from Between 2 and 3" + } + } + ] + } + }, + { + "type": "named", + "data": { + "name": "Score from Between 2 and 3" + } + }, + { + "type": "named", + "data": { + "name": "Turn off Shooter and Intake" + } + } + ] + } + }, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/3 to Between 2-3.path b/src/main/deploy/pathplanner/paths/3 to Between 2-3.path index 6fc3e6ee..5946f025 100644 --- a/src/main/deploy/pathplanner/paths/3 to Between 2-3.path +++ b/src/main/deploy/pathplanner/paths/3 to Between 2-3.path @@ -16,12 +16,12 @@ }, { "anchor": { - "x": 1.74250811605949, - "y": 6.308416077391951 + "x": 3.75, + "y": 6.25 }, "prevControl": { - "x": 2.2333947975784003, - "y": 6.5486372194118445 + "x": 4.24088668151891, + "y": 6.490221142019894 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/4 to Between 2-3.path b/src/main/deploy/pathplanner/paths/4 to Between 2-3.path index b15f006a..cd29f9f1 100644 --- a/src/main/deploy/pathplanner/paths/4 to Between 2-3.path +++ b/src/main/deploy/pathplanner/paths/4 to Between 2-3.path @@ -3,25 +3,25 @@ "waypoints": [ { "anchor": { - "x": 7.873369436306303, - "y": 7.436411005137533 + "x": 8.0, + "y": 7.5 }, "prevControl": null, "nextControl": { - "x": 7.26759438251701, - "y": 7.32152263286715 + "x": 7.394224946210707, + "y": 7.385111627729617 }, "isLocked": false, "linkedName": "\"4\" Center Amp Note" }, { "anchor": { - "x": 1.74250811605949, - "y": 6.308416077391951 + "x": 3.75, + "y": 6.25 }, "prevControl": { - "x": 2.5049491320356694, - "y": 6.3188604748710775 + "x": 4.512441015976179, + "y": 6.260444397479127 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/5 to Between 2-3.path b/src/main/deploy/pathplanner/paths/5 to Between 2-3.path index 2c96efd2..dd867f96 100644 --- a/src/main/deploy/pathplanner/paths/5 to Between 2-3.path +++ b/src/main/deploy/pathplanner/paths/5 to Between 2-3.path @@ -16,28 +16,28 @@ }, { "anchor": { - "x": 5.398047233753502, - "y": 6.350193667308456 + "x": 5.75, + "y": 6.5 }, "prevControl": { - "x": 6.424290661912157, - "y": 6.45113564384921 + "x": 6.78, + "y": 6.5 }, "nextControl": { - "x": 4.12383074129538, - "y": 6.224860897557782 + "x": 4.469634437816428, + "y": 6.5 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 1.74250811605949, - "y": 6.308416077391951 + "x": 3.75, + "y": 6.25 }, "prevControl": { - "x": 2.275172387490122, - "y": 6.308416077390787 + "x": 4.282664271430633, + "y": 6.2499999999988365 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/Between 2-3 to 3.path b/src/main/deploy/pathplanner/paths/Between 2-3 to 3.path index fce3de69..3e427f86 100644 --- a/src/main/deploy/pathplanner/paths/Between 2-3 to 3.path +++ b/src/main/deploy/pathplanner/paths/Between 2-3 to 3.path @@ -3,13 +3,13 @@ "waypoints": [ { "anchor": { - "x": 1.74250811605949, - "y": 6.308416077391951 + "x": 3.75, + "y": 6.25 }, "prevControl": null, "nextControl": { - "x": 2.0453956429541362, - "y": 6.329304872350202 + "x": 4.052887526894647, + "y": 6.2708887949582515 }, "isLocked": false, "linkedName": "Start Between Wing Amp and Speaker Notes" diff --git a/src/main/deploy/pathplanner/paths/Between 2-3 to 4.path b/src/main/deploy/pathplanner/paths/Between 2-3 to 4.path index e84f16d6..ac44442f 100644 --- a/src/main/deploy/pathplanner/paths/Between 2-3 to 4.path +++ b/src/main/deploy/pathplanner/paths/Between 2-3 to 4.path @@ -3,25 +3,25 @@ "waypoints": [ { "anchor": { - "x": 1.74250811605949, - "y": 6.308416077391951 + "x": 3.75, + "y": 6.25 }, "prevControl": null, "nextControl": { - "x": 2.74250811605949, - "y": 6.308416077391951 + "x": 4.749999999999995, + "y": 6.25 }, "isLocked": false, "linkedName": "Start Between Wing Amp and Speaker Notes" }, { "anchor": { - "x": 7.873369436306303, - "y": 7.436411005137533 + "x": 8.0, + "y": 7.5 }, "prevControl": { - "x": 6.873369436306303, - "y": 7.436411005137533 + "x": 7.0, + "y": 7.5 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/Between 2-3 to 5.path b/src/main/deploy/pathplanner/paths/Between 2-3 to 5.path new file mode 100644 index 00000000..37a569a1 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/Between 2-3 to 5.path @@ -0,0 +1,68 @@ +{ + "version": 1.0, + "waypoints": [ + { + "anchor": { + "x": 3.75, + "y": 6.25 + }, + "prevControl": null, + "nextControl": { + "x": 4.75, + "y": 6.25 + }, + "isLocked": false, + "linkedName": "Start Between Wing Amp and Speaker Notes" + }, + { + "anchor": { + "x": 5.75, + "y": 6.5 + }, + "prevControl": { + "x": 4.75, + "y": 6.5 + }, + "nextControl": { + "x": 6.976584197962229, + "y": 6.5 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 8.0, + "y": 5.75 + }, + "prevControl": { + "x": 7.3, + "y": 5.75 + }, + "nextControl": null, + "isLocked": false, + "linkedName": "\"5\" Center Amp Mid Note" + } + ], + "rotationTargets": [], + "constraintZones": [], + "eventMarkers": [], + "globalConstraints": { + "maxVelocity": 5.0, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0 + }, + "goalEndState": { + "velocity": 0, + "rotation": 0, + "rotateFast": false + }, + "reversed": false, + "folder": null, + "previewStartingState": { + "rotation": 0, + "velocity": 0 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/Between A-C to Between 2-3.path b/src/main/deploy/pathplanner/paths/Between A-C to Between 2-3.path new file mode 100644 index 00000000..1738c5ea --- /dev/null +++ b/src/main/deploy/pathplanner/paths/Between A-C to Between 2-3.path @@ -0,0 +1,52 @@ +{ + "version": 1.0, + "waypoints": [ + { + "anchor": { + "x": 1.35, + "y": 6.5 + }, + "prevControl": null, + "nextControl": { + "x": 2.3159258262890683, + "y": 6.241180954897479 + }, + "isLocked": false, + "linkedName": "Between A-C" + }, + { + "anchor": { + "x": 3.75, + "y": 6.25 + }, + "prevControl": { + "x": 2.75, + "y": 6.25 + }, + "nextControl": null, + "isLocked": false, + "linkedName": "Start Between Wing Amp and Speaker Notes" + } + ], + "rotationTargets": [], + "constraintZones": [], + "eventMarkers": [], + "globalConstraints": { + "maxVelocity": 4.0, + "maxAcceleration": 3.0, + "maxAngularVelocity": 540.0, + "maxAngularAcceleration": 720.0 + }, + "goalEndState": { + "velocity": 0, + "rotation": 0, + "rotateFast": false + }, + "reversed": false, + "folder": null, + "previewStartingState": { + "rotation": 0, + "velocity": 0 + }, + "useDefaultConstraints": false +} \ No newline at end of file diff --git a/src/main/java/frc/robot/commands/auto/AutoNamedCommands.java b/src/main/java/frc/robot/commands/auto/AutoNamedCommands.java index d137b249..d4807ad4 100644 --- a/src/main/java/frc/robot/commands/auto/AutoNamedCommands.java +++ b/src/main/java/frc/robot/commands/auto/AutoNamedCommands.java @@ -51,7 +51,7 @@ public static class AutoConstants { 28, ArmConstants.noteScoreAngleInDegrees, ShooterConstants.velocityInRPM); public static AutoScoreConstants scoreFromBetween2and3 = new AutoScoreConstants( - 21, ArmConstants.noteScoreAngleInDegrees, ShooterConstants.velocityInRPM); + 11, ArmConstants.noteScoreAngleInDegrees, ShooterConstants.velocityInRPM); } public static void configure() {