Merge pull request #38 from PIXLwastaken/main

pix-xl · web-flow · commit 4ea645f60636 · 2025-04-03T20:57:35.000-04:00
qWFAWEVAWEGV :)
diff --git a/src/main/deploy/pathplanner/autos/Mid_1_G.auto b/src/main/deploy/pathplanner/autos/Mid_1_G.auto
@@ -25,6 +25,12 @@
                 "data": {
                   "name": "LineUpRight"
                 }
+              },
+              {
+                "type": "wait",
+                "data": {
+                  "waitTime": 2.5
+                }
               }
             ]
           }
diff --git a/src/main/deploy/pathplanner/paths/C_Load.path b/src/main/deploy/pathplanner/paths/C_Load.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.6672500000000001,
-        "y": 0.6807499999999993
+        "x": 1.693421052631579,
+        "y": 0.7151315789473688
       },
       "prevControl": {
-        "x": 2.091426034836473,
-        "y": 1.5330974051593276
+        "x": 2.1175970874680523,
+        "y": 1.5674789841066974
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/D_Load.path b/src/main/deploy/pathplanner/paths/D_Load.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.6672500000000001,
-        "y": 0.6807499999999993
+        "x": 1.693421052631579,
+        "y": 0.7151315789473688
       },
       "prevControl": {
-        "x": 2.1224648400109403,
-        "y": 0.9559681053027043
+        "x": 2.148635892642519,
+        "y": 0.9903496842500739
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/F_Load.path b/src/main/deploy/pathplanner/paths/F_Load.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.6672500000000001,
-        "y": 0.6807499999999993
+        "x": 1.693421052631579,
+        "y": 0.7151315789473688
       },
       "prevControl": {
-        "x": 2.5403478260869576,
-        "y": 1.3337391304347817
+        "x": 2.566518878718536,
+        "y": 1.3681207093821506
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/I_Load.path b/src/main/deploy/pathplanner/paths/I_Load.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.70625,
-        "y": 7.31075
+        "x": 1.7607730263157892,
+        "y": 7.3541118421052625
       },
       "prevControl": {
-        "x": 2.9828827328027745,
-        "y": 6.907224661476541
+        "x": 3.0374057591185633,
+        "y": 6.950586503581804
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/K_Load.path b/src/main/deploy/pathplanner/paths/K_Load.path
@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.6965000000000001,
-        "y": 7.31075
+        "x": 1.7607730263157892,
+        "y": 7.3541118421052625
       },
       "prevControl": {
-        "x": 2.526149628904741,
-        "y": 6.55814403518892
+        "x": 2.5904226552205305,
+        "y": 6.601505877294183
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/L_Load.path b/src/main/deploy/pathplanner/paths/L_Load.path
@@ -8,20 +8,20 @@
       },
       "prevControl": null,
       "nextControl": {
-        "x": 1.9762538718454719,
+        "x": 1.9762538718454716,
         "y": 5.874670105580411
       },
       "isLocked": false,
       "linkedName": "L"
     },
     {
       "anchor": {
-        "x": 1.6965000000000001,
-        "y": 7.31075
+        "x": 1.7607730263157892,
+        "y": 7.3541118421052625
       },
       "prevControl": {
-        "x": 2.125692970026915,
-        "y": 6.708617685551795
+        "x": 2.1899659963427043,
+        "y": 6.751979527657058
       },
       "nextControl": null,
       "isLocked": false,
diff --git a/src/main/deploy/pathplanner/paths/Load_C.path b/src/main/deploy/pathplanner/paths/Load_C.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.6672500000000001,
-        "y": 0.6807499999999993
+        "x": 1.693421052631579,
+        "y": 0.7151315789473688
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.335595428956344,
-        "y": 1.1592541578848965
+        "x": 2.3617664815879227,
+        "y": 1.1936357368322659
       },
       "isLocked": false,
       "linkedName": "RightLoad"
diff --git a/src/main/deploy/pathplanner/paths/Load_D.path b/src/main/deploy/pathplanner/paths/Load_D.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.6672500000000001,
-        "y": 0.6807499999999993
+        "x": 1.693421052631579,
+        "y": 0.7151315789473688
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.164634098905838,
-        "y": 0.8286216643092434
+        "x": 2.190805151537417,
+        "y": 0.8630032432566129
       },
       "isLocked": false,
       "linkedName": "RightLoad"
diff --git a/src/main/deploy/pathplanner/paths/Load_K.path b/src/main/deploy/pathplanner/paths/Load_K.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.6965000000000001,
-        "y": 7.31075
+        "x": 1.7607730263157892,
+        "y": 7.3541118421052625
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.1863951269130357,
-        "y": 7.179789992891861
+        "x": 2.2506681532288253,
+        "y": 7.2231518349971235
       },
       "isLocked": false,
       "linkedName": "LeftLoad"
diff --git a/src/main/deploy/pathplanner/paths/Load_L.path b/src/main/deploy/pathplanner/paths/Load_L.path
@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.6965000000000001,
-        "y": 7.31075
+        "x": 1.7607730263157892,
+        "y": 7.3541118421052625
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.422633701194429,
-        "y": 6.55509009009426
+        "x": 2.4869067275102186,
+        "y": 6.598451932199523
       },
       "isLocked": false,
       "linkedName": "LeftLoad"
diff --git a/src/main/java/frc/robot/vision/VisionConfig.java b/src/main/java/frc/robot/vision/VisionConfig.java
diff --git a/src/main/java/frc/robot/vision/commands/AutoAlign.java b/src/main/java/frc/robot/vision/commands/AutoAlign.java

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,12 @@`
`25`	`25`	`"data": {`
`26`	`26`	`"name": "LineUpRight"`
`27`	`27`	`}`
	`28`	`+ },`
	`29`	`+ {`
	`30`	`+ "type": "wait",`
	`31`	`+ "data": {`
	`32`	`+ "waitTime": 2.5`
	`33`	`+ }`
`28`	`34`	`}`
`29`	`35`	`]`
`30`	`36`	`}`