Merge pull request #50 from FRC2713/Shooter-Feeder-Split

Merge shooter/feeder cleanup into new autos
FRC2713 · Mar 29, 2024 · d912a66 · d912a66
2 parents e365122 + cac6905
commit d912a66
Show file tree

Hide file tree

Showing 48 changed files with 8,936 additions and 5,866 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -25,5 +25,6 @@
       }
     },
   ],
-  "java.test.defaultConfig": "WPIlibUnitTests"
+  "java.test.defaultConfig": "WPIlibUnitTests",
+  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"
 }
diff --git a/auto.chor b/auto.chor
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
 
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.1"
+    id "edu.wpi.first.GradleRIO" version "2024.3.2"
     id 'com.diffplug.spotless' version '6.12.0'
     id "io.freefair.lombok" version "8.4"
     id "com.peterabeles.gversion" version "1.10.2"
@@ -199,7 +199,7 @@ project.compileJava.dependsOn(createVersionFile)
 task commitOnDeploy {
     description = 'Commits when deployed.'
     doLast {
-        if (true) {
+        if (false) {
             def date = new Date()
             def sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss")
             grgit.add(patterns: [

diff --git a/src/main/deploy/choreo/Amp Side Long.1.traj b/src/main/deploy/choreo/Amp Side Long.1.traj
@@ -0,0 +1,139 @@
+{
+    "samples": [
+        {
+            "x": 0.7993888854980469,
+            "y": 6.71163272857666,
+            "heading": 1.041206625579802,
+            "angularVelocity": -3.14416901210189e-36,
+            "velocityX": 0,
+            "velocityY": 0,
+            "timestamp": 0
+        },
+        {
+            "x": 0.8369565660075867,
+            "y": 6.714946300796975,
+            "heading": 1.03099908723813,
+            "angularVelocity": -0.13501943753603898,
+            "velocityX": 0.4969236384078872,
+            "velocityY": 0.04383002467847904,
+            "timestamp": 0.07560051002987973
+        },
+        {
+            "x": 0.9120919468924934,
+            "y": 6.721573560030461,
+            "heading": 1.0105862893509643,
+            "angularVelocity": -0.27000873246884044,
+            "velocityX": 0.9938475395894912,
+            "velocityY": 0.08766156777072828,
+            "timestamp": 0.15120102005975947
+        },
+        {
+            "x": 1.0247950599192652,
+            "y": 6.731514688379561,
+            "heading": 0.97997158118458,
+            "angularVelocity": -0.40495372523656786,
+            "velocityX": 1.4907718609600376,
+            "velocityY": 0.1314955196092054,
+            "timestamp": 0.22680153008963921
+        },
+        {
+            "x": 1.1750659301206665,
+            "y": 6.74476994362396,
+            "heading": 0.9391582963285081,
+            "angularVelocity": -0.539854623202162,
+            "velocityX": 1.9876965134495743,
+            "velocityY": 0.17533288120886287,
+            "timestamp": 0.30240204011951893
+        },
+        {
+            "x": 1.3629045483120568,
+            "y": 6.761339664937546,
+            "heading": 0.8881481466232689,
+            "angularVelocity": -0.6747328779273898,
+            "velocityX": 2.484621044449969,
+            "velocityY": 0.21917472920536793,
+            "timestamp": 0.37800255014939865
+        },
+        {
+            "x": 1.5883108313444654,
+            "y": 6.781224275778046,
+            "heading": 0.8269389873132496,
+            "angularVelocity": -0.8096395022444639,
+            "velocityX": 2.981544475603682,
+            "velocityY": 0.26302217845673037,
+            "timestamp": 0.4536030601792784
+        },
+        {
+            "x": 1.8512845411313574,
+            "y": 6.804424322289764,
+            "heading": 0.7555211051941574,
+            "angularVelocity": -0.9446746072330136,
+            "velocityX": 3.4784647574858503,
+            "velocityY": 0.30687685179041124,
+            "timestamp": 0.5292035702091581
+        },
+        {
+            "x": 2.076686560355925,
+            "y": 6.824318772144157,
+            "heading": 0.6940928323255274,
+            "angularVelocity": -0.81253781018609,
+            "velocityX": 2.981488076409555,
+            "velocityY": 0.26315232326515925,
+            "timestamp": 0.6048040802390379
+        },
+        {
+            "x": 2.2645212265449377,
+            "y": 6.84089779996957,
+            "heading": 0.6428821579912505,
+            "angularVelocity": -0.6773853022160409,
+            "velocityX": 2.4845687696389156,
+            "velocityY": 0.21929783038315734,
+            "timestamp": 0.6804045902689176
+        },
+        {
+            "x": 2.4147887684839513,
+            "y": 6.854161155959905,
+            "heading": 0.6019020927482521,
+            "angularVelocity": -0.5420606980931978,
+            "velocityX": 1.987652489111819,
+            "velocityY": 0.17544003321000418,
+            "timestamp": 0.7560051002987974
+        },
+        {
+            "x": 2.5274893385840023,
+            "y": 6.864108729512019,
+            "heading": 0.571161642554905,
+            "angularVelocity": -0.4066169683405246,
+            "velocityX": 1.490738224590134,
+            "velocityY": 0.13158077304216162,
+            "timestamp": 0.8316056103286772
+        },
+        {
+            "x": 2.6026230315073913,
+            "y": 6.87074046603567,
+            "heading": 0.5506665782088404,
+            "angularVelocity": -0.2710969058008255,
+            "velocityX": 0.9938252122068136,
+            "velocityY": 0.08772079078607006,
+            "timestamp": 0.907206120358557
+        },
+        {
+            "x": 2.6401898860931396,
+            "y": 6.874056339263916,
+            "heading": 0.5404194193212295,
+            "angularVelocity": -0.1355435152958739,
+            "velocityX": 0.49691271356371725,
+            "velocityY": 0.04386046108597478,
+            "timestamp": 0.9828066303884367
+        },
+        {
+            "x": 2.6401898860931396,
+            "y": 6.874056339263916,
+            "heading": 0.5404194193212295,
+            "angularVelocity": 0,
+            "velocityX": -8.130535476991451e-38,
+            "velocityY": -1.6509597178136398e-36,
+            "timestamp": 1.0584071404183164
+        }
+    ]
+}