diff --git a/src/main/deploy/pathplanner/autos/3 avril.auto b/src/main/deploy/pathplanner/autos/3 avril.auto index 0a66586..ae63469 100644 --- a/src/main/deploy/pathplanner/autos/3 avril.auto +++ b/src/main/deploy/pathplanner/autos/3 avril.auto @@ -12,13 +12,13 @@ "data": { "commands": [ { - "type": "sequential", + "type": "parallel", "data": { "commands": [ { - "type": "path", + "type": "named", "data": { - "pathName": "3 avril1" + "name": "balayer" } }, { @@ -34,16 +34,41 @@ { "type": "named", "data": { - "name": "balayer" + "name": "lancer" } } ] } }, { - "type": "path", + "type": "sequential", "data": { - "pathName": "3 avril2" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "path", + "data": { + "pathName": "3 avril1" + } + }, + { + "type": "wait", + "data": { + "waitTime": 1.0 + } + }, + { + "type": "path", + "data": { + "pathName": "3 avril2" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/paths/3 avril1.path b/src/main/deploy/pathplanner/paths/3 avril1.path index 2cdd47c..5d2be00 100644 --- a/src/main/deploy/pathplanner/paths/3 avril1.path +++ b/src/main/deploy/pathplanner/paths/3 avril1.path @@ -39,7 +39,7 @@ }, "goalEndState": { "velocity": 0.0, - "rotation": -15.0, + "rotation": 0.0, "rotateFast": false }, "reversed": false, diff --git a/src/main/deploy/pathplanner/paths/3 avril2.path b/src/main/deploy/pathplanner/paths/3 avril2.path index 44db1ec..4a687d7 100644 --- a/src/main/deploy/pathplanner/paths/3 avril2.path +++ b/src/main/deploy/pathplanner/paths/3 avril2.path @@ -8,8 +8,8 @@ }, "prevControl": null, "nextControl": { - "x": 3.2842893955651187, - "y": 5.564873875677809 + "x": 3.2849642626350786, + "y": 5.57 }, "isLocked": false, "linkedName": null @@ -45,7 +45,7 @@ "reversed": false, "folder": null, "previewStartingState": { - "rotation": -16.133487942976338, + "rotation": -0.3989133239630231, "velocity": 0 }, "useDefaultConstraints": false