From 954b091f9d943191c6f3f51b0ef0e31dfa6d1b40 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 19 Feb 2024 19:12:42 -0500 Subject: [PATCH] --- src/main/deploy/pathplanner/autos/B.H.5.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.C.3.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.C.4.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.C.5.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.D.3.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.D.4.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.D.5.auto | 29 ++++++++++++-------- src/main/deploy/pathplanner/autos/R.H.3.auto | 23 ++-------------- 8 files changed, 128 insertions(+), 98 deletions(-) diff --git a/src/main/deploy/pathplanner/autos/B.H.5.auto b/src/main/deploy/pathplanner/autos/B.H.5.auto index 7a0dc5f..0771143 100644 --- a/src/main/deploy/pathplanner/autos/B.H.5.auto +++ b/src/main/deploy/pathplanner/autos/B.H.5.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "3.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "3.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "lancer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.C.3.auto b/src/main/deploy/pathplanner/autos/R.C.3.auto index fcca443..9dcd3f2 100644 --- a/src/main/deploy/pathplanner/autos/R.C.3.auto +++ b/src/main/deploy/pathplanner/autos/R.C.3.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "4.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "4.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "balyer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.C.4.auto b/src/main/deploy/pathplanner/autos/R.C.4.auto index 3b8f377..91cced1 100644 --- a/src/main/deploy/pathplanner/autos/R.C.4.auto +++ b/src/main/deploy/pathplanner/autos/R.C.4.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "4.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "4.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "balyer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.C.5.auto b/src/main/deploy/pathplanner/autos/R.C.5.auto index 4e19546..621e3db 100644 --- a/src/main/deploy/pathplanner/autos/R.C.5.auto +++ b/src/main/deploy/pathplanner/autos/R.C.5.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "4.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "4.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "balyer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.D.3.auto b/src/main/deploy/pathplanner/autos/R.D.3.auto index 902d99a..cec92fd 100644 --- a/src/main/deploy/pathplanner/autos/R.D.3.auto +++ b/src/main/deploy/pathplanner/autos/R.D.3.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "5.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "balyer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.D.4.auto b/src/main/deploy/pathplanner/autos/R.D.4.auto index dd425d2..f43c6b0 100644 --- a/src/main/deploy/pathplanner/autos/R.D.4.auto +++ b/src/main/deploy/pathplanner/autos/R.D.4.auto @@ -38,25 +38,32 @@ } }, { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", + "type": "sequential", "data": { "commands": [ { - "type": "named", + "type": "path", "data": { - "name": "balyer" + "pathName": "5.1" } }, { - "type": "wait", + "type": "deadline", "data": { - "waitTime": 3.0 + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.D.5.auto b/src/main/deploy/pathplanner/autos/R.D.5.auto index e7c6626..615fb4e 100644 --- a/src/main/deploy/pathplanner/autos/R.D.5.auto +++ b/src/main/deploy/pathplanner/autos/R.D.5.auto @@ -31,25 +31,32 @@ } }, { - "type": "path", - "data": { - "pathName": "5.1" - } - }, - { - "type": "deadline", + "type": "parallel", "data": { "commands": [ { - "type": "wait", + "type": "path", "data": { - "waitTime": 3.0 + "pathName": "5.1" } }, { - "type": "named", + "type": "deadline", "data": { - "name": "balyer" + "commands": [ + { + "type": "wait", + "data": { + "waitTime": 3.0 + } + }, + { + "type": "named", + "data": { + "name": "balyer" + } + } + ] } } ] diff --git a/src/main/deploy/pathplanner/autos/R.H.3.auto b/src/main/deploy/pathplanner/autos/R.H.3.auto index ce14187..eb497e4 100644 --- a/src/main/deploy/pathplanner/autos/R.H.3.auto +++ b/src/main/deploy/pathplanner/autos/R.H.3.auto @@ -31,28 +31,9 @@ } }, { - "type": "path", + "type": "parallel", "data": { - "pathName": "6.1" - } - }, - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "wait", - "data": { - "waitTime": 3.0 - } - }, - { - "type": "named", - "data": { - "name": "balyer" - } - } - ] + "commands": [] } } ]