From 5885bbd532013124f9f6a08e0f793f96cc53ad75 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 3 Apr 2024 19:17:01 -0400 Subject: [PATCH] v --- .../deploy/pathplanner/autos/3 avril.auto | 8 +- src/main/deploy/pathplanner/autos/B.C.5.auto | 192 ------------------ .../paths/{3 avril.path => 3 avril1.path} | 8 +- .../deploy/pathplanner/paths/3 avril2.path | 52 +++++ 4 files changed, 63 insertions(+), 197 deletions(-) rename src/main/deploy/pathplanner/paths/{3 avril.path => 3 avril1.path} (87%) create mode 100644 src/main/deploy/pathplanner/paths/3 avril2.path diff --git a/src/main/deploy/pathplanner/autos/3 avril.auto b/src/main/deploy/pathplanner/autos/3 avril.auto index 6714b47..6961844 100644 --- a/src/main/deploy/pathplanner/autos/3 avril.auto +++ b/src/main/deploy/pathplanner/autos/3 avril.auto @@ -18,7 +18,7 @@ { "type": "path", "data": { - "pathName": "3 avril" + "pathName": "3 avril1" } }, { @@ -42,6 +42,12 @@ } ] } + }, + { + "type": "path", + "data": { + "pathName": "3 avril2" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/B.C.5.auto b/src/main/deploy/pathplanner/autos/B.C.5.auto index f384f59..9b5f523 100644 --- a/src/main/deploy/pathplanner/autos/B.C.5.auto +++ b/src/main/deploy/pathplanner/autos/B.C.5.auto @@ -62,198 +62,6 @@ ] } }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "1.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, { "type": "path", "data": { diff --git a/src/main/deploy/pathplanner/paths/3 avril.path b/src/main/deploy/pathplanner/paths/3 avril1.path similarity index 87% rename from src/main/deploy/pathplanner/paths/3 avril.path rename to src/main/deploy/pathplanner/paths/3 avril1.path index c5ed499..e6e6867 100644 --- a/src/main/deploy/pathplanner/paths/3 avril.path +++ b/src/main/deploy/pathplanner/paths/3 avril1.path @@ -3,12 +3,12 @@ "waypoints": [ { "anchor": { - "x": 1.2654580294915574, + "x": 1.27, "y": 5.566417514601411 }, "prevControl": null, "nextControl": { - "x": 1.2654580294915574, + "x": 1.27, "y": 5.5430292057165325 }, "isLocked": false, @@ -16,11 +16,11 @@ }, { "anchor": { - "x": 3.230075975821467, + "x": 3.27, "y": 5.566417514601411 }, "prevControl": { - "x": 3.241770130263907, + "x": 3.28169415444244, "y": 5.566417514601411 }, "nextControl": null, diff --git a/src/main/deploy/pathplanner/paths/3 avril2.path b/src/main/deploy/pathplanner/paths/3 avril2.path new file mode 100644 index 0000000..c3129d0 --- /dev/null +++ b/src/main/deploy/pathplanner/paths/3 avril2.path @@ -0,0 +1,52 @@ +{ + "version": 1.0, + "waypoints": [ + { + "anchor": { + "x": 3.265158439148787, + "y": 5.57 + }, + "prevControl": null, + "nextControl": { + "x": 3.265158439148787, + "y": 5.589805823486292 + }, + "isLocked": false, + "linkedName": null + }, + { + "anchor": { + "x": 1.27, + "y": 5.57 + }, + "prevControl": { + "x": 1.2654580294915574, + "y": 5.578111669043852 + }, + "nextControl": null, + "isLocked": false, + "linkedName": null + } + ], + "rotationTargets": [], + "constraintZones": [], + "eventMarkers": [], + "globalConstraints": { + "maxVelocity": 1.0, + "maxAcceleration": 0.5, + "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