diff --git a/src/main/deploy/pathplanner/autos/+5 spin 90 -5.auto b/src/main/deploy/pathplanner/autos/+5 spin 90 -5.auto deleted file mode 100644 index cf0d2a3..0000000 --- a/src/main/deploy/pathplanner/autos/+5 spin 90 -5.auto +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 2.0, - "y": 7.0 - }, - "rotation": 0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "+5 spin 90" - } - }, - { - "type": "wait", - "data": { - "waitTime": 1.0 - } - }, - { - "type": "path", - "data": { - "pathName": "-5m" - } - } - ] - } - }, - "folder": null, - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/+5m -5m.auto b/src/main/deploy/pathplanner/autos/+5m -5m.auto deleted file mode 100644 index a834275..0000000 --- a/src/main/deploy/pathplanner/autos/+5m -5m.auto +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 2, - "y": 7.0 - }, - "rotation": 0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "+5m" - } - }, - { - "type": "wait", - "data": { - "waitTime": 1.0 - } - }, - { - "type": "path", - "data": { - "pathName": "-5m" - } - } - ] - } - }, - "folder": null, - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/+5m.auto b/src/main/deploy/pathplanner/autos/amp 1.auto similarity index 70% rename from src/main/deploy/pathplanner/autos/+5m.auto rename to src/main/deploy/pathplanner/autos/amp 1.auto index 1e1b6ca..da198d1 100644 --- a/src/main/deploy/pathplanner/autos/+5m.auto +++ b/src/main/deploy/pathplanner/autos/amp 1.auto @@ -2,10 +2,10 @@ "version": 1.0, "startingPose": { "position": { - "x": 2, - "y": 7.0 + "x": 1.2177246172674163, + "y": 6.408848454060545 }, - "rotation": 0 + "rotation": 60.0 }, "command": { "type": "sequential", @@ -14,7 +14,7 @@ { "type": "path", "data": { - "pathName": "+5m" + "pathName": "amp.near" } } ] diff --git a/src/main/deploy/pathplanner/autos/mid 1.auto b/src/main/deploy/pathplanner/autos/mid 1.auto new file mode 100644 index 0000000..07d4e33 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/mid 1.auto @@ -0,0 +1,18 @@ +{ + "version": 1.0, + "startingPose": { + "position": { + "x": 2, + "y": 2 + }, + "rotation": 0 + }, + "command": { + "type": "sequential", + "data": { + "commands": [] + } + }, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/source 1.auto b/src/main/deploy/pathplanner/autos/source 1.auto new file mode 100644 index 0000000..07d4e33 --- /dev/null +++ b/src/main/deploy/pathplanner/autos/source 1.auto @@ -0,0 +1,18 @@ +{ + "version": 1.0, + "startingPose": { + "position": { + "x": 2, + "y": 2 + }, + "rotation": 0 + }, + "command": { + "type": "sequential", + "data": { + "commands": [] + } + }, + "folder": null, + "choreoAuto": false +} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/+5m.path b/src/main/deploy/pathplanner/paths/+5m.path deleted file mode 100644 index a0916da..0000000 --- a/src/main/deploy/pathplanner/paths/+5m.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 2.0, - "y": 7.0 - }, - "prevControl": null, - "nextControl": { - "x": 3.118033988749895, - "y": 7.0 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 7.0, - "y": 7.0 - }, - "prevControl": { - "x": 6.88, - "y": 7.0 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [], - "constraintZones": [], - "eventMarkers": [], - "globalConstraints": { - "maxVelocity": 3.0, - "maxAcceleration": 3.0, - "maxAngularVelocity": 540.0, - "maxAngularAcceleration": 720.0 - }, - "goalEndState": { - "velocity": 0, - "rotation": 0, - "rotateFast": false - }, - "reversed": false, - "folder": null, - "previewStartingState": null, - "useDefaultConstraints": true -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/-5m.path b/src/main/deploy/pathplanner/paths/-5m.path deleted file mode 100644 index b40caea..0000000 --- a/src/main/deploy/pathplanner/paths/-5m.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 7.0, - "y": 7.0 - }, - "prevControl": null, - "nextControl": { - "x": 8.118033988749895, - "y": 7.0 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 2.0, - "y": 7.0 - }, - "prevControl": { - "x": 1.88, - "y": 7.0 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [], - "constraintZones": [], - "eventMarkers": [], - "globalConstraints": { - "maxVelocity": 3.0, - "maxAcceleration": 3.0, - "maxAngularVelocity": 540.0, - "maxAngularAcceleration": 720.0 - }, - "goalEndState": { - "velocity": 0, - "rotation": 0, - "rotateFast": false - }, - "reversed": false, - "folder": null, - "previewStartingState": null, - "useDefaultConstraints": true -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/+5 spin 90.path b/src/main/deploy/pathplanner/paths/amp.near.path similarity index 67% rename from src/main/deploy/pathplanner/paths/+5 spin 90.path rename to src/main/deploy/pathplanner/paths/amp.near.path index 9995b33..908099b 100644 --- a/src/main/deploy/pathplanner/paths/+5 spin 90.path +++ b/src/main/deploy/pathplanner/paths/amp.near.path @@ -3,32 +3,38 @@ "waypoints": [ { "anchor": { - "x": 2.0, - "y": 7.0 + "x": 1.22, + "y": 6.41 }, "prevControl": null, "nextControl": { - "x": 3.0, - "y": 7.0 + "x": 2.8289896186546137, + "y": 6.41 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 7.0, - "y": 7.0 + "x": 2.374489112614589, + "y": 6.670053340106681 }, "prevControl": { - "x": 6.0, - "y": 7.0 + "x": 1.3744891126145888, + "y": 6.670053340106681 }, "nextControl": null, "isLocked": false, "linkedName": null } ], - "rotationTargets": [], + "rotationTargets": [ + { + "waypointRelativePos": 0, + "rotationDegrees": 60.0, + "rotateFast": true + } + ], "constraintZones": [], "eventMarkers": [], "globalConstraints": { @@ -39,7 +45,7 @@ }, "goalEndState": { "velocity": 0, - "rotation": -90.0, + "rotation": 30.0, "rotateFast": false }, "reversed": false,