From 36ae40454170c65c592370e6e142b9e635c1cff4 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 26 Feb 2024 18:45:03 -0500 Subject: [PATCH] --- .pathplanner/settings.json | 12 +-- src/main/deploy/pathplanner/autos/9.auto | 2 +- .../deploy/pathplanner/autos/B recule.auto | 2 +- src/main/deploy/pathplanner/autos/B.D.1.auto | 38 -------- src/main/deploy/pathplanner/autos/B.D.2.auto | 44 --------- src/main/deploy/pathplanner/autos/B.D.3.auto | 70 -------------- src/main/deploy/pathplanner/autos/B.D.4.auto | 76 --------------- src/main/deploy/pathplanner/autos/B.D.5.auto | 95 ------------------- src/main/deploy/pathplanner/autos/B.H.1.auto | 38 -------- src/main/deploy/pathplanner/autos/B.H.2.auto | 44 --------- src/main/deploy/pathplanner/autos/B.H.3.auto | 95 ------------------- src/main/deploy/pathplanner/autos/B.H.4.auto | 76 --------------- .../deploy/pathplanner/autos/B.H.5.2.auto | 95 ------------------- src/main/deploy/pathplanner/autos/B.H.5.auto | 6 +- .../pathplanner/autos/Copy of B.C.2.auto | 50 ---------- .../deploy/pathplanner/autos/R recule.auto | 2 +- src/main/deploy/pathplanner/autos/R.D.1.auto | 38 -------- src/main/deploy/pathplanner/autos/R.D.2.auto | 44 --------- src/main/deploy/pathplanner/autos/R.D.3.auto | 70 -------------- src/main/deploy/pathplanner/autos/R.D.4.auto | 83 ---------------- src/main/deploy/pathplanner/autos/R.D.5.auto | 95 ------------------- src/main/deploy/pathplanner/autos/R.H.1.auto | 38 -------- src/main/deploy/pathplanner/autos/R.H.2.auto | 44 --------- src/main/deploy/pathplanner/autos/R.H.3.auto | 70 -------------- src/main/deploy/pathplanner/autos/R.H.4.auto | 76 --------------- src/main/deploy/pathplanner/autos/R.H.5.auto | 95 ------------------- src/main/deploy/pathplanner/autos/test.auto | 44 --------- src/main/deploy/pathplanner/paths/3.1.path | 71 -------------- src/main/deploy/pathplanner/paths/3.2.path | 49 ---------- src/main/deploy/pathplanner/paths/5.1.path | 49 ---------- src/main/deploy/pathplanner/paths/5.2.path | 49 ---------- src/main/deploy/pathplanner/paths/6.1.path | 71 -------------- src/main/deploy/pathplanner/paths/6.2.path | 49 ---------- src/main/deploy/pathplanner/paths/7.path | 14 +-- src/main/deploy/pathplanner/paths/8.path | 12 +-- src/main/deploy/pathplanner/paths/9.path | 6 +- .../paths/{1.4.path => Copy of bh.path} | 23 +++-- .../pathplanner/paths/{1.3.path => bh.path} | 19 ++-- src/main/deploy/pathplanner/paths/test.path | 52 ---------- 39 files changed, 50 insertions(+), 1856 deletions(-) delete mode 100644 src/main/deploy/pathplanner/autos/B.D.1.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.D.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.D.3.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.D.4.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.D.5.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.H.1.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.H.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.H.3.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.H.4.auto delete mode 100644 src/main/deploy/pathplanner/autos/B.H.5.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/Copy of B.C.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.D.1.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.D.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.D.3.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.D.4.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.D.5.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.H.1.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.H.2.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.H.3.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.H.4.auto delete mode 100644 src/main/deploy/pathplanner/autos/R.H.5.auto delete mode 100644 src/main/deploy/pathplanner/autos/test.auto delete mode 100644 src/main/deploy/pathplanner/paths/3.1.path delete mode 100644 src/main/deploy/pathplanner/paths/3.2.path delete mode 100644 src/main/deploy/pathplanner/paths/5.1.path delete mode 100644 src/main/deploy/pathplanner/paths/5.2.path delete mode 100644 src/main/deploy/pathplanner/paths/6.1.path delete mode 100644 src/main/deploy/pathplanner/paths/6.2.path rename src/main/deploy/pathplanner/paths/{1.4.path => Copy of bh.path} (68%) rename src/main/deploy/pathplanner/paths/{1.3.path => bh.path} (72%) delete mode 100644 src/main/deploy/pathplanner/paths/test.path diff --git a/.pathplanner/settings.json b/.pathplanner/settings.json index bda535b..aced414 100644 --- a/.pathplanner/settings.json +++ b/.pathplanner/settings.json @@ -5,22 +5,18 @@ "pathFolders": [ "1", "2", - "3", "4", - "5", - "6", "7", - "8" + "8", + "9" ], "autoFolders": [ "1", "2", - "3", "4", - "5", - "6", "7", - "8" + "8", + "9" ], "defaultMaxVel": 3.0, "defaultMaxAccel": 3.0, diff --git a/src/main/deploy/pathplanner/autos/9.auto b/src/main/deploy/pathplanner/autos/9.auto index 5e2996b..c5a28f3 100644 --- a/src/main/deploy/pathplanner/autos/9.auto +++ b/src/main/deploy/pathplanner/autos/9.auto @@ -96,6 +96,6 @@ ] } }, - "folder": null, + "folder": "9", "choreoAuto": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B recule.auto b/src/main/deploy/pathplanner/autos/B recule.auto index fc52e5e..5cb9ee1 100644 --- a/src/main/deploy/pathplanner/autos/B recule.auto +++ b/src/main/deploy/pathplanner/autos/B recule.auto @@ -3,7 +3,7 @@ "startingPose": { "position": { "x": 1.35, - "y": 3.0 + "y": 2.0 }, "rotation": 90.0 }, diff --git a/src/main/deploy/pathplanner/autos/B.D.1.auto b/src/main/deploy/pathplanner/autos/B.D.1.auto deleted file mode 100644 index f1871dc..0000000 --- a/src/main/deploy/pathplanner/autos/B.D.1.auto +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 4.4 - }, - "rotation": 120.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - } - ] - } - } - ] - } - }, - "folder": "2", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.D.2.auto b/src/main/deploy/pathplanner/autos/B.D.2.auto deleted file mode 100644 index 5fc8939..0000000 --- a/src/main/deploy/pathplanner/autos/B.D.2.auto +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 4.4 - }, - "rotation": 30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "2.1" - } - } - ] - } - }, - "folder": "2", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.D.3.auto b/src/main/deploy/pathplanner/autos/B.D.3.auto deleted file mode 100644 index 20ee269..0000000 --- a/src/main/deploy/pathplanner/autos/B.D.3.auto +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 4.4 - }, - "rotation": 30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "2.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balyer" - } - } - ] - } - } - ] - } - } - ] - } - }, - "folder": "2", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.D.4.auto b/src/main/deploy/pathplanner/autos/B.D.4.auto deleted file mode 100644 index 192e1c7..0000000 --- a/src/main/deploy/pathplanner/autos/B.D.4.auto +++ /dev/null @@ -1,76 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 4.4 - }, - "rotation": 30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "2.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balyer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "2.2" - } - } - ] - } - }, - "folder": "2", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.D.5.auto b/src/main/deploy/pathplanner/autos/B.D.5.auto deleted file mode 100644 index 1224652..0000000 --- a/src/main/deploy/pathplanner/autos/B.D.5.auto +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 4.4 - }, - "rotation": 30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "2.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balyer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "2.2" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "2", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.1.auto b/src/main/deploy/pathplanner/autos/B.H.1.auto deleted file mode 100644 index 3a7c630..0000000 --- a/src/main/deploy/pathplanner/autos/B.H.1.auto +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 6.7 - }, - "rotation": 150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "3", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.2.auto b/src/main/deploy/pathplanner/autos/B.H.2.auto deleted file mode 100644 index f3caa80..0000000 --- a/src/main/deploy/pathplanner/autos/B.H.2.auto +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 6.7 - }, - "rotation": 150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "3.1" - } - } - ] - } - }, - "folder": "3", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.3.auto b/src/main/deploy/pathplanner/autos/B.H.3.auto deleted file mode 100644 index 6638a11..0000000 --- a/src/main/deploy/pathplanner/autos/B.H.3.auto +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 6.7 - }, - "rotation": 150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "3.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "3.2" - } - }, - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "3", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.4.auto b/src/main/deploy/pathplanner/autos/B.H.4.auto deleted file mode 100644 index 69db549..0000000 --- a/src/main/deploy/pathplanner/autos/B.H.4.auto +++ /dev/null @@ -1,76 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 6.7 - }, - "rotation": -30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "3.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "3.2" - } - } - ] - } - }, - "folder": "3", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.5.2.auto b/src/main/deploy/pathplanner/autos/B.H.5.2.auto deleted file mode 100644 index c55ff2e..0000000 --- a/src/main/deploy/pathplanner/autos/B.H.5.2.auto +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 0.7, - "y": 6.7 - }, - "rotation": 150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "3.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "3.2" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "3", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/B.H.5.auto b/src/main/deploy/pathplanner/autos/B.H.5.auto index 9ba6bef..3a1fd8a 100644 --- a/src/main/deploy/pathplanner/autos/B.H.5.auto +++ b/src/main/deploy/pathplanner/autos/B.H.5.auto @@ -37,7 +37,7 @@ { "type": "path", "data": { - "pathName": "Copy of 1.1" + "pathName": "bh" } }, { @@ -65,7 +65,7 @@ { "type": "path", "data": { - "pathName": "Copy of 1.2" + "pathName": "Copy of bh" } }, { @@ -90,6 +90,6 @@ ] } }, - "folder": "1", + "folder": "2", "choreoAuto": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/Copy of B.C.2.auto b/src/main/deploy/pathplanner/autos/Copy of B.C.2.auto deleted file mode 100644 index daa5abf..0000000 --- a/src/main/deploy/pathplanner/autos/Copy of B.C.2.auto +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 1.3, - "y": 5.55 - }, - "rotation": 90.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "1.3" - } - }, - { - "type": "path", - "data": { - "pathName": "1.4" - } - } - ] - } - }, - "folder": "1", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R recule.auto b/src/main/deploy/pathplanner/autos/R recule.auto index 26bb53d..6b349c6 100644 --- a/src/main/deploy/pathplanner/autos/R recule.auto +++ b/src/main/deploy/pathplanner/autos/R recule.auto @@ -3,7 +3,7 @@ "startingPose": { "position": { "x": 15.25, - "y": 3.0 + "y": 2.0 }, "rotation": -90.0 }, diff --git a/src/main/deploy/pathplanner/autos/R.D.1.auto b/src/main/deploy/pathplanner/autos/R.D.1.auto deleted file mode 100644 index ccf4f92..0000000 --- a/src/main/deploy/pathplanner/autos/R.D.1.auto +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.85, - "y": 4.4 - }, - "rotation": 60.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "5", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.D.2.auto b/src/main/deploy/pathplanner/autos/R.D.2.auto deleted file mode 100644 index 05155eb..0000000 --- a/src/main/deploy/pathplanner/autos/R.D.2.auto +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.85, - "y": 4.4 - }, - "rotation": -30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "5.1" - } - } - ] - } - }, - "folder": "5", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.D.3.auto b/src/main/deploy/pathplanner/autos/R.D.3.auto deleted file mode 100644 index 41a4218..0000000 --- a/src/main/deploy/pathplanner/autos/R.D.3.auto +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.85, - "y": 4.4 - }, - "rotation": -30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - } - ] - } - }, - "folder": "5", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.D.4.auto b/src/main/deploy/pathplanner/autos/R.D.4.auto deleted file mode 100644 index f8af908..0000000 --- a/src/main/deploy/pathplanner/autos/R.D.4.auto +++ /dev/null @@ -1,83 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.85, - "y": 4.4 - }, - "rotation": -30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - } - ] - } - }, - { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "5.2" - } - } - ] - } - }, - "folder": "5", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.D.5.auto b/src/main/deploy/pathplanner/autos/R.D.5.auto deleted file mode 100644 index 51d4a20..0000000 --- a/src/main/deploy/pathplanner/autos/R.D.5.auto +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.85, - "y": 4.4 - }, - "rotation": -30.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "5.2" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "5", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.H.1.auto b/src/main/deploy/pathplanner/autos/R.H.1.auto deleted file mode 100644 index ecb4ba1..0000000 --- a/src/main/deploy/pathplanner/autos/R.H.1.auto +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.8, - "y": 6.65 - }, - "rotation": -150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "6", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.H.2.auto b/src/main/deploy/pathplanner/autos/R.H.2.auto deleted file mode 100644 index 3028239..0000000 --- a/src/main/deploy/pathplanner/autos/R.H.2.auto +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.8, - "y": 6.65 - }, - "rotation": -57.24696656392663 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "6.1" - } - } - ] - } - }, - "folder": "6", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.H.3.auto b/src/main/deploy/pathplanner/autos/R.H.3.auto deleted file mode 100644 index c57aa94..0000000 --- a/src/main/deploy/pathplanner/autos/R.H.3.auto +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.8, - "y": 6.65 - }, - "rotation": -150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "6.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - } - ] - } - }, - "folder": "6", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.H.4.auto b/src/main/deploy/pathplanner/autos/R.H.4.auto deleted file mode 100644 index 2460a99..0000000 --- a/src/main/deploy/pathplanner/autos/R.H.4.auto +++ /dev/null @@ -1,76 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.8, - "y": 6.65 - }, - "rotation": -150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "6.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "6.2" - } - } - ] - } - }, - "folder": "6", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/R.H.5.auto b/src/main/deploy/pathplanner/autos/R.H.5.auto deleted file mode 100644 index 858160c..0000000 --- a/src/main/deploy/pathplanner/autos/R.H.5.auto +++ /dev/null @@ -1,95 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.8, - "y": 6.65 - }, - "rotation": -150.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "parallel", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "6.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.7 - } - }, - { - "type": "named", - "data": { - "name": "balayer" - } - } - ] - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "6.2" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - } - ] - } - }, - "folder": "6", - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/test.auto b/src/main/deploy/pathplanner/autos/test.auto deleted file mode 100644 index e50e0a3..0000000 --- a/src/main/deploy/pathplanner/autos/test.auto +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1.0, - "startingPose": { - "position": { - "x": 15.18, - "y": 4.81 - }, - "rotation": 0.0 - }, - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, - { - "type": "path", - "data": { - "pathName": "test" - } - } - ] - } - }, - "folder": null, - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/3.1.path b/src/main/deploy/pathplanner/paths/3.1.path deleted file mode 100644 index 059ea4c..0000000 --- a/src/main/deploy/pathplanner/paths/3.1.path +++ /dev/null @@ -1,71 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 0.7, - "y": 6.7 - }, - "prevControl": null, - "nextControl": { - "x": 0.6993965107276529, - "y": 6.6989547259184725 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 1.0, - "y": 7.010076157919538 - }, - "prevControl": { - "x": 0.9826713353359282, - "y": 6.993362712119278 - }, - "nextControl": { - "x": 1.0187773121213508, - "y": 7.028186819906404 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 2.9078895212422267, - "y": 7.010076157919538 - }, - "prevControl": { - "x": 2.926777941719328, - "y": 7.000326399702681 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [ - { - "waypointRelativePos": 1, - "rotationDegrees": 178.3779748731589, - "rotateFast": false - } - ], - "constraintZones": [], - "eventMarkers": [], - "globalConstraints": { - "maxVelocity": 1.0, - "maxAcceleration": 1.0, - "maxAngularVelocity": 90.0, - "maxAngularAcceleration": 90.0 - }, - "goalEndState": { - "velocity": 0, - "rotation": -0.9710219310792203, - "rotateFast": false - }, - "reversed": false, - "folder": "3", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/3.2.path b/src/main/deploy/pathplanner/paths/3.2.path deleted file mode 100644 index fc41907..0000000 --- a/src/main/deploy/pathplanner/paths/3.2.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 2.7, - "y": 7.0 - }, - "prevControl": null, - "nextControl": { - "x": 2.710911765291465, - "y": 6.990576641485824 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 0.7, - "y": 6.7 - }, - "prevControl": { - "x": 0.7125383894358018, - "y": 6.713974263386468 - }, - "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": 149.12800064001866, - "rotateFast": false - }, - "reversed": false, - "folder": "3", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/5.1.path b/src/main/deploy/pathplanner/paths/5.1.path deleted file mode 100644 index b1d8eb7..0000000 --- a/src/main/deploy/pathplanner/paths/5.1.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 15.85, - "y": 4.4 - }, - "prevControl": null, - "nextControl": { - "x": 15.85312975966851, - "y": 4.40542090276134 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 14.0, - "y": 4.1 - }, - "prevControl": { - "x": 14.011940966373402, - "y": 4.093105879849931 - }, - "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": -155.07456608690077, - "rotateFast": false - }, - "reversed": false, - "folder": "5", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/5.2.path b/src/main/deploy/pathplanner/paths/5.2.path deleted file mode 100644 index aa123ab..0000000 --- a/src/main/deploy/pathplanner/paths/5.2.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 14.0, - "y": 4.1 - }, - "prevControl": null, - "nextControl": { - "x": 14.002432289858724, - "y": 4.1 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 15.85, - "y": 4.4 - }, - "prevControl": { - "x": 15.82771353771501, - "y": 4.361398715001432 - }, - "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": 60.38412103232163, - "rotateFast": false - }, - "reversed": false, - "folder": "5", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/6.1.path b/src/main/deploy/pathplanner/paths/6.1.path deleted file mode 100644 index 2579f98..0000000 --- a/src/main/deploy/pathplanner/paths/6.1.path +++ /dev/null @@ -1,71 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 15.8, - "y": 6.65 - }, - "prevControl": null, - "nextControl": { - "x": 15.810493547475788, - "y": 6.65 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 15.436328829902315, - "y": 7.0198259161363925 - }, - "prevControl": { - "x": 15.445191739926624, - "y": 7.009263511274084 - }, - "nextControl": { - "x": 15.427465919878006, - "y": 7.030388320998702 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 13.661872834434506, - "y": 7.0198259161363925 - }, - "prevControl": { - "x": 13.67276677878254, - "y": 7.006843018822101 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [ - { - "waypointRelativePos": 1, - "rotationDegrees": -70.17753542963476, - "rotateFast": false - } - ], - "constraintZones": [], - "eventMarkers": [], - "globalConstraints": { - "maxVelocity": 1.0, - "maxAcceleration": 1.0, - "maxAngularVelocity": 90.0, - "maxAngularAcceleration": 720.0 - }, - "goalEndState": { - "velocity": 0, - "rotation": -66.2505055071331, - "rotateFast": false - }, - "reversed": false, - "folder": "6", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/6.2.path b/src/main/deploy/pathplanner/paths/6.2.path deleted file mode 100644 index 8a1d6d0..0000000 --- a/src/main/deploy/pathplanner/paths/6.2.path +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 14.0, - "y": 7.0 - }, - "prevControl": null, - "nextControl": { - "x": 14.023088833925678, - "y": 7.0 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 15.8, - "y": 6.65 - }, - "prevControl": { - "x": 15.806819642142848, - "y": 6.668834620329574 - }, - "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": -58.20379119767198, - "rotateFast": false - }, - "reversed": false, - "folder": "6", - "previewStartingState": null, - "useDefaultConstraints": false -} \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/7.path b/src/main/deploy/pathplanner/paths/7.path index 0bc88b8..14e7122 100644 --- a/src/main/deploy/pathplanner/paths/7.path +++ b/src/main/deploy/pathplanner/paths/7.path @@ -4,24 +4,24 @@ { "anchor": { "x": 1.35, - "y": 3.0 + "y": 2.0 }, "prevControl": null, "nextControl": { - "x": 1.3576779647621067, - "y": 2.993175772574823 + "x": 1.357677964762107, + "y": 1.9931757725748231 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 3.2198817841816214, - "y": 3.0 + "x": 7.849266980585242, + "y": 2.0 }, "prevControl": { - "x": 3.20038226774791, - "y": 3.019499516433713 + "x": 7.829767464151531, + "y": 2.019499516433713 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/8.path b/src/main/deploy/pathplanner/paths/8.path index 8d78948..b6bb6a6 100644 --- a/src/main/deploy/pathplanner/paths/8.path +++ b/src/main/deploy/pathplanner/paths/8.path @@ -4,24 +4,24 @@ { "anchor": { "x": 15.25, - "y": 3.0 + "y": 2.0 }, "prevControl": null, "nextControl": { "x": 15.242762626364385, - "y": 3.0 + "y": 2.0 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 14.0, - "y": 3.0 + "x": 8.9, + "y": 2.0 }, "prevControl": { - "x": 14.014562140186673, - "y": 3.0 + "x": 8.914562140186673, + "y": 2.0 }, "nextControl": null, "isLocked": false, diff --git a/src/main/deploy/pathplanner/paths/9.path b/src/main/deploy/pathplanner/paths/9.path index dfd5514..acfb06d 100644 --- a/src/main/deploy/pathplanner/paths/9.path +++ b/src/main/deploy/pathplanner/paths/9.path @@ -3,12 +3,12 @@ "waypoints": [ { "anchor": { - "x": 1.3, + "x": 1.15, "y": 5.55 }, "prevControl": null, "nextControl": { - "x": 1.270750725349431, + "x": 1.1207507253494309, "y": 5.55 }, "isLocked": false, @@ -43,7 +43,7 @@ "rotateFast": false }, "reversed": false, - "folder": null, + "folder": "9", "previewStartingState": { "rotation": -179.76648041708185, "velocity": 0 diff --git a/src/main/deploy/pathplanner/paths/1.4.path b/src/main/deploy/pathplanner/paths/Copy of bh.path similarity index 68% rename from src/main/deploy/pathplanner/paths/1.4.path rename to src/main/deploy/pathplanner/paths/Copy of bh.path index 52367ec..4305bcc 100644 --- a/src/main/deploy/pathplanner/paths/1.4.path +++ b/src/main/deploy/pathplanner/paths/Copy of bh.path @@ -3,25 +3,25 @@ "waypoints": [ { "anchor": { - "x": 2.68045071702679, - "y": 6.501949869996606 + "x": 3.0, + "y": 5.32 }, "prevControl": null, "nextControl": { - "x": 2.707108120996868, - "y": 6.501949869996606 + "x": 3.0239288017037573, + "y": 5.3013350512740915 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 3.124828585839508, - "y": 6.607197259978566 + "x": 1.32, + "y": 5.55 }, "prevControl": { - "x": 3.0602479997335497, - "y": 6.607197259978566 + "x": 1.3335845656403569, + "y": 5.537407335775345 }, "nextControl": null, "isLocked": false, @@ -39,11 +39,14 @@ }, "goalEndState": { "velocity": 0, - "rotation": 88.93908830973585, + "rotation": -1.0244170279689457, "rotateFast": false }, "reversed": false, "folder": "1", - "previewStartingState": null, + "previewStartingState": { + "rotation": -39.441926245401206, + "velocity": 0 + }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/1.3.path b/src/main/deploy/pathplanner/paths/bh.path similarity index 72% rename from src/main/deploy/pathplanner/paths/1.3.path rename to src/main/deploy/pathplanner/paths/bh.path index fd866e7..11a7b03 100644 --- a/src/main/deploy/pathplanner/paths/1.3.path +++ b/src/main/deploy/pathplanner/paths/bh.path @@ -8,20 +8,20 @@ }, "prevControl": null, "nextControl": { - "x": 1.3266574039700785, - "y": 5.55 + "x": 1.3239288017037572, + "y": 5.531335051274091 }, "isLocked": false, "linkedName": null }, { "anchor": { - "x": 2.68045071702679, - "y": 6.501949869996606 + "x": 3.0, + "y": 5.32 }, "prevControl": { - "x": 2.6158701309208316, - "y": 6.501949869996606 + "x": 3.0135845656403566, + "y": 5.307407335775346 }, "nextControl": null, "isLocked": false, @@ -39,11 +39,14 @@ }, "goalEndState": { "velocity": 0, - "rotation": -66.44773632710536, + "rotation": 22.90324251953112, "rotateFast": false }, "reversed": false, "folder": "1", - "previewStartingState": null, + "previewStartingState": { + "rotation": 89.89148648270589, + "velocity": 0 + }, "useDefaultConstraints": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/paths/test.path b/src/main/deploy/pathplanner/paths/test.path deleted file mode 100644 index a3a8c1e..0000000 --- a/src/main/deploy/pathplanner/paths/test.path +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": 1.0, - "waypoints": [ - { - "anchor": { - "x": 15.182835116264057, - "y": 4.8066308009100585 - }, - "prevControl": null, - "nextControl": { - "x": 15.182835116264057, - "y": 4.8258390977013725 - }, - "isLocked": false, - "linkedName": null - }, - { - "anchor": { - "x": 15.182835116264057, - "y": 7.1855718058229465 - }, - "prevControl": { - "x": 15.192447316011023, - "y": 7.181673109189449 - }, - "nextControl": null, - "isLocked": false, - "linkedName": null - } - ], - "rotationTargets": [], - "constraintZones": [], - "eventMarkers": [], - "globalConstraints": { - "maxVelocity": 1.0, - "maxAcceleration": 1.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