From 900087c5ffbf76c3ca624739f0f62e13afbaf828 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:40:33 -0500 Subject: [PATCH 1/4] auto --- simgui.json | 17 +++------ src/main/deploy/pathplanner/autos/1.2.auto | 12 +++--- src/main/deploy/pathplanner/autos/1.3.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/1.4.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/1.5.auto | 36 +++++++++--------- src/main/deploy/pathplanner/autos/2.2.auto | 12 +++--- src/main/deploy/pathplanner/autos/2.3.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/2.4.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/2.5.auto | 36 +++++++++--------- src/main/deploy/pathplanner/autos/3.1.auto | 12 +++--- src/main/deploy/pathplanner/autos/3.2.auto | 12 +++--- src/main/deploy/pathplanner/autos/3.3.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/3.4.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/3.5.auto | 36 +++++++++--------- src/main/deploy/pathplanner/autos/4.1.auto | 12 +++--- src/main/deploy/pathplanner/autos/4.2.auto | 12 +++--- src/main/deploy/pathplanner/autos/4.3.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/4.4.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/4.5.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/5.1.auto | 19 +++------- src/main/deploy/pathplanner/autos/5.2.auto | 19 +++------- src/main/deploy/pathplanner/autos/5.3.auto | 31 ++++++---------- src/main/deploy/pathplanner/autos/5.5.auto | 43 +++++++++------------- src/main/deploy/pathplanner/autos/6.1.auto | 12 +++--- src/main/deploy/pathplanner/autos/6.2.auto | 12 +++--- src/main/deploy/pathplanner/autos/6.3.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/6.4.auto | 24 ++++++------ src/main/deploy/pathplanner/autos/6.5.auto | 36 +++++++++--------- 28 files changed, 299 insertions(+), 334 deletions(-) diff --git a/simgui.json b/simgui.json index 6615be0..047b6fb 100644 --- a/simgui.json +++ b/simgui.json @@ -5,18 +5,6 @@ "visible": true } }, - "Other Devices": { - "SPARK MAX [26]": { - "header": { - "open": true - } - }, - "SPARK MAX [27]": { - "header": { - "open": true - } - } - }, "Solenoids": { "0": { "header": { @@ -36,6 +24,11 @@ "/SmartDashboard/Pigeon IMU [0]": "Gyro" }, "windows": { + "/Shuffleboard/dashboard/autochooser": { + "window": { + "visible": true + } + }, "/SmartDashboard/Field": { "bottom": 1476, "height": 8.210550308227539, diff --git a/src/main/deploy/pathplanner/autos/1.2.auto b/src/main/deploy/pathplanner/autos/1.2.auto index a557e76..b2db2b5 100644 --- a/src/main/deploy/pathplanner/autos/1.2.auto +++ b/src/main/deploy/pathplanner/autos/1.2.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/1.3.auto b/src/main/deploy/pathplanner/autos/1.3.auto index f749089..e03567d 100644 --- a/src/main/deploy/pathplanner/autos/1.3.auto +++ b/src/main/deploy/pathplanner/autos/1.3.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/1.4.auto b/src/main/deploy/pathplanner/autos/1.4.auto index fa1607d..6e06e00 100644 --- a/src/main/deploy/pathplanner/autos/1.4.auto +++ b/src/main/deploy/pathplanner/autos/1.4.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/1.5.auto b/src/main/deploy/pathplanner/autos/1.5.auto index 8eb44dc..23f05cf 100644 --- a/src/main/deploy/pathplanner/autos/1.5.auto +++ b/src/main/deploy/pathplanner/autos/1.5.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } @@ -65,17 +65,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/2.2.auto b/src/main/deploy/pathplanner/autos/2.2.auto index 8cc5cf1..d225767 100644 --- a/src/main/deploy/pathplanner/autos/2.2.auto +++ b/src/main/deploy/pathplanner/autos/2.2.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/2.3.auto b/src/main/deploy/pathplanner/autos/2.3.auto index 9664be9..3cd5557 100644 --- a/src/main/deploy/pathplanner/autos/2.3.auto +++ b/src/main/deploy/pathplanner/autos/2.3.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/2.4.auto b/src/main/deploy/pathplanner/autos/2.4.auto index 4bd326d..b2a1901 100644 --- a/src/main/deploy/pathplanner/autos/2.4.auto +++ b/src/main/deploy/pathplanner/autos/2.4.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/2.5.auto b/src/main/deploy/pathplanner/autos/2.5.auto index 4db4968..9a1589f 100644 --- a/src/main/deploy/pathplanner/autos/2.5.auto +++ b/src/main/deploy/pathplanner/autos/2.5.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } @@ -65,17 +65,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/3.1.auto b/src/main/deploy/pathplanner/autos/3.1.auto index 60135e2..f52296d 100644 --- a/src/main/deploy/pathplanner/autos/3.1.auto +++ b/src/main/deploy/pathplanner/autos/3.1.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/3.2.auto b/src/main/deploy/pathplanner/autos/3.2.auto index fab233e..4719e02 100644 --- a/src/main/deploy/pathplanner/autos/3.2.auto +++ b/src/main/deploy/pathplanner/autos/3.2.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/3.3.auto b/src/main/deploy/pathplanner/autos/3.3.auto index e899dae..ce4eab5 100644 --- a/src/main/deploy/pathplanner/autos/3.3.auto +++ b/src/main/deploy/pathplanner/autos/3.3.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/3.4.auto b/src/main/deploy/pathplanner/autos/3.4.auto index ee52ad4..2485fff 100644 --- a/src/main/deploy/pathplanner/autos/3.4.auto +++ b/src/main/deploy/pathplanner/autos/3.4.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/3.5.auto b/src/main/deploy/pathplanner/autos/3.5.auto index a22e873..7a0dc5f 100644 --- a/src/main/deploy/pathplanner/autos/3.5.auto +++ b/src/main/deploy/pathplanner/autos/3.5.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -65,17 +65,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/4.1.auto b/src/main/deploy/pathplanner/autos/4.1.auto index c55e797..1d526a8 100644 --- a/src/main/deploy/pathplanner/autos/4.1.auto +++ b/src/main/deploy/pathplanner/autos/4.1.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/4.2.auto b/src/main/deploy/pathplanner/autos/4.2.auto index 873f45d..3e5df99 100644 --- a/src/main/deploy/pathplanner/autos/4.2.auto +++ b/src/main/deploy/pathplanner/autos/4.2.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/4.3.auto b/src/main/deploy/pathplanner/autos/4.3.auto index 309d666..fcca443 100644 --- a/src/main/deploy/pathplanner/autos/4.3.auto +++ b/src/main/deploy/pathplanner/autos/4.3.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/4.4.auto b/src/main/deploy/pathplanner/autos/4.4.auto index 1921381..3b8f377 100644 --- a/src/main/deploy/pathplanner/autos/4.4.auto +++ b/src/main/deploy/pathplanner/autos/4.4.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/4.5.auto b/src/main/deploy/pathplanner/autos/4.5.auto index 3e57efa..4e19546 100644 --- a/src/main/deploy/pathplanner/autos/4.5.auto +++ b/src/main/deploy/pathplanner/autos/4.5.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/5.1.auto b/src/main/deploy/pathplanner/autos/5.1.auto index bc613d0..ccf4f92 100644 --- a/src/main/deploy/pathplanner/autos/5.1.auto +++ b/src/main/deploy/pathplanner/autos/5.1.auto @@ -15,24 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/5.2.auto b/src/main/deploy/pathplanner/autos/5.2.auto index 209d455..fbbd903 100644 --- a/src/main/deploy/pathplanner/autos/5.2.auto +++ b/src/main/deploy/pathplanner/autos/5.2.auto @@ -15,24 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/5.3.auto b/src/main/deploy/pathplanner/autos/5.3.auto index 9cd6456..902d99a 100644 --- a/src/main/deploy/pathplanner/autos/5.3.auto +++ b/src/main/deploy/pathplanner/autos/5.3.auto @@ -15,24 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -47,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/5.5.auto b/src/main/deploy/pathplanner/autos/5.5.auto index a1412af..e7c6626 100644 --- a/src/main/deploy/pathplanner/autos/5.5.auto +++ b/src/main/deploy/pathplanner/autos/5.5.auto @@ -15,24 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "deadline", - "data": { - "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - } - ] - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -47,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } @@ -72,17 +65,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/6.1.auto b/src/main/deploy/pathplanner/autos/6.1.auto index 1733bae..88b4194 100644 --- a/src/main/deploy/pathplanner/autos/6.1.auto +++ b/src/main/deploy/pathplanner/autos/6.1.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/6.2.auto b/src/main/deploy/pathplanner/autos/6.2.auto index adc3a77..b354106 100644 --- a/src/main/deploy/pathplanner/autos/6.2.auto +++ b/src/main/deploy/pathplanner/autos/6.2.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/6.3.auto b/src/main/deploy/pathplanner/autos/6.3.auto index ca3fe4a..ce14187 100644 --- a/src/main/deploy/pathplanner/autos/6.3.auto +++ b/src/main/deploy/pathplanner/autos/6.3.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/6.4.auto b/src/main/deploy/pathplanner/autos/6.4.auto index 8716b08..1cd567a 100644 --- a/src/main/deploy/pathplanner/autos/6.4.auto +++ b/src/main/deploy/pathplanner/autos/6.4.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } diff --git a/src/main/deploy/pathplanner/autos/6.5.auto b/src/main/deploy/pathplanner/autos/6.5.auto index 52cf9b4..2751b1b 100644 --- a/src/main/deploy/pathplanner/autos/6.5.auto +++ b/src/main/deploy/pathplanner/autos/6.5.auto @@ -15,17 +15,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } @@ -40,17 +40,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "balyer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "balyer" + } } ] } @@ -65,17 +65,17 @@ "type": "deadline", "data": { "commands": [ - { - "type": "named", - "data": { - "name": "lancer" - } - }, { "type": "wait", "data": { "waitTime": 3.0 } + }, + { + "type": "named", + "data": { + "name": "lancer" + } } ] } From 7a37782ca19fb71cb842174cd8fcd536eda825a9 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Mon, 12 Feb 2024 18:40:52 -0500 Subject: [PATCH 2/4] --- simgui-ds.json | 10 ++++++++++ simgui.json | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/simgui-ds.json b/simgui-ds.json index 1fa3b25..00ed9e6 100644 --- a/simgui-ds.json +++ b/simgui-ds.json @@ -1,4 +1,14 @@ { + "FMS": { + "window": { + "visible": false + } + }, + "System Joysticks": { + "window": { + "visible": false + } + }, "keyboardJoysticks": [ { "axisConfig": [ diff --git a/simgui.json b/simgui.json index 047b6fb..070af3e 100644 --- a/simgui.json +++ b/simgui.json @@ -14,6 +14,11 @@ "window": { "visible": true } + }, + "Timing": { + "window": { + "visible": false + } } }, "NTProvider": { From 63aad0f693f87fe31d2460de83485b524a2f3e07 Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 12 Feb 2024 19:13:25 -0500 Subject: [PATCH 3/4] k --- src/main/java/frc/robot/RobotContainer.java | 2 +- src/main/java/frc/robot/command/AllumeLED.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 9461c4a..5a715bb 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -71,7 +71,7 @@ public class RobotContainer { Lancerampli lancerampli = new Lancerampli(lanceur,limelight); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); - AllumeLED allumeLED = new AllumeLED(LED); + AllumeLED allumeLED = new AllumeLED(LED,accumulateur); Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); public RobotContainer() { dashboard.addCamera("limelight", "limelight","limelight.local:5800"); diff --git a/src/main/java/frc/robot/command/AllumeLED.java b/src/main/java/frc/robot/command/AllumeLED.java index dd1d09e..484ecb3 100644 --- a/src/main/java/frc/robot/command/AllumeLED.java +++ b/src/main/java/frc/robot/command/AllumeLED.java @@ -12,7 +12,7 @@ public class AllumeLED extends Command { private LED led; private Accumulateur accumulateur; /** Creates a new AllumeLED. */ - public AllumeLED(LED led) { + public AllumeLED(LED led,Accumulateur accumulateur) { this.accumulateur = accumulateur; this.led = led; addRequirements(led); From 7a8dfb3a1318b8c4449473a1d3a948eb66213a3c Mon Sep 17 00:00:00 2001 From: OlivierDubois Date: Mon, 12 Feb 2024 19:15:10 -0500 Subject: [PATCH 4/4] s --- src/main/java/frc/robot/RobotContainer.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 1e54a52..cfde281 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -71,13 +71,8 @@ public class RobotContainer { LancerNote lancernote = new LancerNote(lanceur, accumulateur); Lancerampli lancerampli = new Lancerampli(lanceur,limelight); GrimpeurDroit grimpeurDroit = new GrimpeurDroit(grimpeur, manette::getLeftX); -<<<<<<< HEAD - GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getLeftY); - AllumeLED allumeLED = new AllumeLED(LED,accumulateur); -======= GrimpeurGauche grimpeurGauche = new GrimpeurGauche(grimpeur, manette::getRightX); AllumeLED allumeLED = new AllumeLED(LED, accumulateur); ->>>>>>> 7a37782ca19fb71cb842174cd8fcd536eda825a9 Pistongrimpeur pistongrimpeur = new Pistongrimpeur(grimpeur, LED); public RobotContainer() { dashboard.addCamera("limelight", "limelight","limelight.local:5800");