From 994b025127f69c73f69cab1317d430205441041a Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Wed, 10 Apr 2024 19:22:07 -0400 Subject: [PATCH] --- .../deploy/pathplanner/autos/10 avril.auto | 19 ++++++++++--------- .../deploy/pathplanner/paths/3 avril1.path | 2 +- .../deploy/pathplanner/paths/3 avril2.path | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/10 avril.auto b/src/main/deploy/pathplanner/autos/10 avril.auto index c015f77..354ad4c 100644 --- a/src/main/deploy/pathplanner/autos/10 avril.auto +++ b/src/main/deploy/pathplanner/autos/10 avril.auto @@ -2,7 +2,7 @@ "version": 1.0, "startingPose": { "position": { - "x": 1.35, + "x": 1.3, "y": 5.55 }, "rotation": 0 @@ -16,15 +16,9 @@ "data": { "commands": [ { - "type": "deadline", + "type": "parallel", "data": { "commands": [ - { - "type": "wait", - "data": { - "waitTime": 1.0 - } - }, { "type": "named", "data": { @@ -80,7 +74,14 @@ "data": { "waitTime": 0.2 } - }, + } + ] + } + }, + { + "type": "parallel", + "data": { + "commands": [ { "type": "named", "data": { diff --git a/src/main/deploy/pathplanner/paths/3 avril1.path b/src/main/deploy/pathplanner/paths/3 avril1.path index 0a11684..7b9bd22 100644 --- a/src/main/deploy/pathplanner/paths/3 avril1.path +++ b/src/main/deploy/pathplanner/paths/3 avril1.path @@ -33,7 +33,7 @@ "eventMarkers": [], "globalConstraints": { "maxVelocity": 2.0, - "maxAcceleration": 0.75, + "maxAcceleration": 1.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0 }, diff --git a/src/main/deploy/pathplanner/paths/3 avril2.path b/src/main/deploy/pathplanner/paths/3 avril2.path index 7c72f07..51659cb 100644 --- a/src/main/deploy/pathplanner/paths/3 avril2.path +++ b/src/main/deploy/pathplanner/paths/3 avril2.path @@ -16,11 +16,11 @@ }, { "anchor": { - "x": 1.27, + "x": 1.1, "y": 5.57 }, "prevControl": { - "x": 1.260703297854801, + "x": 1.090703297854801, "y": 5.57 }, "nextControl": null, @@ -33,7 +33,7 @@ "eventMarkers": [], "globalConstraints": { "maxVelocity": 2.0, - "maxAcceleration": 0.75, + "maxAcceleration": 1.0, "maxAngularVelocity": 540.0, "maxAngularAcceleration": 720.0 },