tweaks to L1 and auto align good when PIs are on

.OutlineViewer/outlineviewer.json

@@ -1,13 +1,58 @@
 {
+  "Clients": {
+    "open": true
+  },
+  "Connections": {
+    "open": true
+  },
   "NetworkTables Settings": {
     "mode": "Client (NT4)"
   },
+  "client@1": {
+    "Publishers": {
+      "open": true
+    },
+    "open": true
+  },
+  "client@2": {
+    "open": true
+  },
+  "client@3": {
+    "open": true
+  },
+  "client@4": {
+    "Publishers": {
+      "open": true
+    },
+    "open": true
+  },
+  "client@5": {
+    "Publishers": {
+      "open": true
+    },
+    "open": true
+  },
+  "outlineviewer@2": {
+    "Publishers": {
+      "open": true
+    },
+    "open": true
+  },
+  "outlineviewer@3": {
+    "open": true
+  },
+  "shuffleboard@1": {
+    "open": true
+  },
   "transitory": {
     "Shuffleboard": {
       "Sensors Tab": {
         "open": true
       },
       "open": true
+    },
+    "orange_Fiducial": {
+      "open": true
     }
   }
 }

src/main/deploy/pathplanner/autos/1 L4 Center.auto

@@ -4,6 +4,12 @@
     "type": "sequential",
     "data": {
       "commands": [
+        {
+          "type": "named",
+          "data": {
+            "name": "Lift L4"
+          }
+        },
         {
           "type": "path",
           "data": {

src/main/deploy/pathplanner/autos/2.5 Coral Left.auto

@@ -0,0 +1,81 @@
+{
+  "version": "2025.0",
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Start to 30 Right"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Shoot Coral L4"
+          }
+        },
+        {
+          "type": "parallel",
+          "data": {
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "30 Right to HP"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "HP Pickup"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Collect Coral"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "HP to 330 Right"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Shoot Coral L4"
+          }
+        },
+        {
+          "type": "parallel",
+          "data": {
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "L Backup"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "HP Pickup"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  },
+  "resetOdom": true,
+  "folder": null,
+  "choreoAuto": false
+}

src/main/deploy/pathplanner/autos/3 Coral Left.auto

@@ -0,0 +1,99 @@
+{
+  "version": "2025.0",
+  "command": {
+    "type": "sequential",
+    "data": {
+      "commands": [
+        {
+          "type": "path",
+          "data": {
+            "pathName": "Start to 30 Right"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Shoot Coral L4"
+          }
+        },
+        {
+          "type": "parallel",
+          "data": {
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "30 Right to HP"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "HP Pickup"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Collect Coral"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "HP to 330 Right"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Shoot Coral L4"
+          }
+        },
+        {
+          "type": "parallel",
+          "data": {
+            "commands": [
+              {
+                "type": "path",
+                "data": {
+                  "pathName": "L Backup"
+                }
+              },
+              {
+                "type": "named",
+                "data": {
+                  "name": "HP Pickup"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Collect Coral"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "HP to K"
+          }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "Shoot Coral L4"
+          }
+        }
+      ]
+    }
+  },
+  "resetOdom": true,
+  "folder": null,
+  "choreoAuto": false
+}

src/main/deploy/pathplanner/autos/Field Oriented Test Auto.auto

@@ -1,19 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "Field Oriented Test Path"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}

src/main/deploy/pathplanner/autos/One Coral Left.auto

@@ -10,6 +10,18 @@
             "pathName": "Start to 30 Right"
           }
         },
+        {
+          "type": "named",
+          "data": {
+            "name": "Lift L4"
+          }
+        },
+        {
+          "type": "path",
+          "data": {
+            "pathName": "J Approach"
+          }
+        },
         {
           "type": "named",
           "data": {
@@ -21,6 +33,12 @@
           "data": {
             "pathName": "J Backup"
           }
+        },
+        {
+          "type": "named",
+          "data": {
+            "name": "HP Pickup"
+          }
         }
       ]
     }

src/main/deploy/pathplanner/autos/Two Coral Left.auto

@@ -1,49 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "Start to 30 Right"
-          }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "Shoot Coral L4"
-          }
-        },
-        {
-          "type": "path",
-          "data": {
-            "pathName": "30 Right to HP"
-          }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "Collect Coral"
-          }
-        },
-        {
-          "type": "path",
-          "data": {
-            "pathName": "HP to 330 Left"
-          }
-        },
-        {
-          "type": "named",
-          "data": {
-            "name": "Shoot Coral L4"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}

src/main/deploy/pathplanner/autos/fein.auto

@@ -1,19 +0,0 @@
-{
-  "version": "2025.0",
-  "command": {
-    "type": "sequential",
-    "data": {
-      "commands": [
-        {
-          "type": "path",
-          "data": {
-            "pathName": "fein"
-          }
-        }
-      ]
-    }
-  },
-  "resetOdom": true,
-  "folder": null,
-  "choreoAuto": false
-}

src/main/deploy/pathplanner/paths/30 Right to HP.path

@@ -16,12 +16,12 @@
     },
     {
       "anchor": {
-        "x": 1.3072345890410957,
-        "y": 7.135316780821918
+        "x": 1.1987704918032787,
+        "y": 7.189754098360656
       },
       "prevControl": {
-        "x": 2.1636986301369863,
-        "y": 6.188698630136986
+        "x": 2.055234532899169,
+        "y": 6.243135947675724
       },
       "nextControl": null,
       "isLocked": false,
@@ -31,17 +31,10 @@
   "rotationTargets": [],
   "constraintZones": [],
   "pointTowardsZones": [],
-  "eventMarkers": [
-    {
-      "name": "HP Pickup",
-      "waypointRelativePos": 0.20476190476190542,
-      "endWaypointRelativePos": null,
-      "command": null
-    }
-  ],
+  "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 5.0,
+    "maxAcceleration": 2.5,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -52,10 +45,10 @@
     "rotation": -53.97262661489646
   },
   "reversed": false,
-  "folder": null,
+  "folder": "Left Paths",
   "idealStartingState": {
     "velocity": 0,
     "rotation": -120.06858282186238
   },
-  "useDefaultConstraints": true
+  "useDefaultConstraints": false
 }

src/main/deploy/pathplanner/paths/330 Right to HP.path

@@ -45,8 +45,8 @@
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 5.0,
+    "maxAcceleration": 2.5,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -57,10 +57,10 @@
     "rotation": -53.98486432191523
   },
   "reversed": false,
-  "folder": null,
+  "folder": "Left Paths",
   "idealStartingState": {
     "velocity": 0,
     "rotation": -59.99999999999999
   },
-  "useDefaultConstraints": true
+  "useDefaultConstraints": false
 }

src/main/deploy/pathplanner/paths/E to HP.path

@@ -0,0 +1,73 @@
+{
+  "version": "2025.0",
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 4.958476027397261,
+        "y": 2.837970890410959
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 5.619606164383562,
+        "y": 1.455607876712329
+      },
+      "isLocked": false,
+      "linkedName": "E"
+    },
+    {
+      "anchor": {
+        "x": 1.1569777397260272,
+        "y": 1.0198630136986298
+      },
+      "prevControl": {
+        "x": 2.7647260273972605,
+        "y": 1.485659246575342
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": "Right HP"
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "pointTowardsZones": [],
+  "eventMarkers": [
+    {
+      "name": "HP Pickup",
+      "waypointRelativePos": 0.22857142857142831,
+      "endWaypointRelativePos": null,
+      "command": {
+        "type": "parallel",
+        "data": {
+          "commands": [
+            {
+              "type": "named",
+              "data": {
+                "name": "HP Pickup"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "globalConstraints": {
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 400.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": 54.162347045721745
+  },
+  "reversed": false,
+  "folder": null,
+  "idealStartingState": {
+    "velocity": 0,
+    "rotation": 120.25643716352937
+  },
+  "useDefaultConstraints": true
+}

src/main/deploy/pathplanner/paths/H Backup.path

@@ -33,8 +33,8 @@
   "pointTowardsZones": [],
   "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/HP to 330 Right.path

@@ -3,29 +3,29 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 1.3072345890410957,
-        "y": 7.135316780821918
+        "x": 1.1987704918032787,
+        "y": 7.189754098360656
       },
       "prevControl": null,
       "nextControl": {
-        "x": 2.5994434931506847,
-        "y": 6.909931506849315
+        "x": 2.490979395912868,
+        "y": 6.964368824388053
       },
       "isLocked": false,
       "linkedName": "HP Left Position"
     },
     {
       "anchor": {
-        "x": 3.973766447368421,
-        "y": 5.246957236842105
+        "x": 3.6202868852459016,
+        "y": 5.031967213114754
       },
       "prevControl": {
-        "x": 3.6582270638067773,
-        "y": 5.772856209444845
+        "x": 3.304747501684258,
+        "y": 5.557866185717494
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "L"
     }
   ],
   "rotationTargets": [],
@@ -34,14 +34,19 @@
   "eventMarkers": [
     {
       "name": "Lift L4",
-      "waypointRelativePos": 0.5,
+      "waypointRelativePos": 0.0,
       "endWaypointRelativePos": null,
-      "command": null
+      "command": {
+        "type": "named",
+        "data": {
+          "name": "Lift L4"
+        }
+      }
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -52,7 +57,7 @@
     "rotation": -59.69923999693802
   },
   "reversed": false,
-  "folder": null,
+  "folder": "Left Paths",
   "idealStartingState": {
     "velocity": 0,
     "rotation": -53.97262661489646

src/main/deploy/pathplanner/paths/HP to D.path

@@ -0,0 +1,73 @@
+{
+  "version": "2025.0",
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 1.187029109589041,
+        "y": 0.9747859589041092
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 2.268878424657535,
+        "y": 1.0949914383561645
+      },
+      "isLocked": false,
+      "linkedName": null
+    },
+    {
+      "anchor": {
+        "x": 4.011857876712329,
+        "y": 2.837970890410959
+      },
+      "prevControl": {
+        "x": 3.3657534246575342,
+        "y": 1.9364297945205475
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "pointTowardsZones": [],
+  "eventMarkers": [
+    {
+      "name": "Lift L4",
+      "waypointRelativePos": 0.27142857142857096,
+      "endWaypointRelativePos": null,
+      "command": {
+        "type": "parallel",
+        "data": {
+          "commands": [
+            {
+              "type": "named",
+              "data": {
+                "name": "Lift L4"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "globalConstraints": {
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 400.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": 58.57043438516136
+  },
+  "reversed": false,
+  "folder": null,
+  "idealStartingState": {
+    "velocity": 0,
+    "rotation": 54.24611274556325
+  },
+  "useDefaultConstraints": true
+}

src/main/deploy/pathplanner/paths/HP to K.path

@@ -0,0 +1,66 @@
+{
+  "version": "2025.0",
+  "waypoints": [
+    {
+      "anchor": {
+        "x": 1.1987704918032787,
+        "y": 7.189754098360656
+      },
+      "prevControl": null,
+      "nextControl": {
+        "x": 1.7142418032786886,
+        "y": 6.638319672131147
+      },
+      "isLocked": false,
+      "linkedName": "HP Left Position"
+    },
+    {
+      "anchor": {
+        "x": 3.9679303278688525,
+        "y": 5.211782786885246
+      },
+      "prevControl": {
+        "x": 3.2246926229508195,
+        "y": 6.230737704918033
+      },
+      "nextControl": null,
+      "isLocked": false,
+      "linkedName": null
+    }
+  ],
+  "rotationTargets": [],
+  "constraintZones": [],
+  "pointTowardsZones": [],
+  "eventMarkers": [
+    {
+      "name": "Lift L4",
+      "waypointRelativePos": 0.0,
+      "endWaypointRelativePos": null,
+      "command": {
+        "type": "named",
+        "data": {
+          "name": "Lift L4"
+        }
+      }
+    }
+  ],
+  "globalConstraints": {
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
+    "maxAngularVelocity": 540.0,
+    "maxAngularAcceleration": 400.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
+  },
+  "goalEndState": {
+    "velocity": 0,
+    "rotation": -60.49491285058726
+  },
+  "reversed": false,
+  "folder": "Left Paths",
+  "idealStartingState": {
+    "velocity": 0,
+    "rotation": -53.97262661489646
+  },
+  "useDefaultConstraints": true
+}

src/main/deploy/pathplanner/paths/J Approach.path

@@ -3,29 +3,29 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 2.0,
-        "y": 7.0
+        "x": 5.286577868852459,
+        "y": 5.955020491803278
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.0,
-        "y": 7.0
+        "x": 5.166700819672132,
+        "y": 5.679303278688525
       },
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "Before J"
     },
     {
       "anchor": {
-        "x": 4.495389344262295,
-        "y": 6.788165983606557
+        "x": 4.974897540983607,
+        "y": 5.235758196721312
       },
       "prevControl": {
-        "x": 3.4164959016393444,
-        "y": 6.80015368852459
+        "x": 5.058811475409836,
+        "y": 5.523463114754099
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "J"
     }
   ],
   "rotationTargets": [],
@@ -33,8 +33,8 @@
   "pointTowardsZones": [],
   "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -42,13 +42,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": -90.0
+    "rotation": -119.71497744813712
   },
   "reversed": false,
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -119.71497744813712
   },
   "useDefaultConstraints": true
 }

src/main/deploy/pathplanner/paths/J Backup.path

@@ -3,13 +3,13 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 4.988527397260274,
-        "y": 5.227054794520548
+        "x": 4.974897540983607,
+        "y": 5.235758196721312
       },
       "prevControl": null,
       "nextControl": {
-        "x": 5.1321837955756875,
-        "y": 5.49468698033176
+        "x": 5.11855393929902,
+        "y": 5.503390382532524
       },
       "isLocked": false,
       "linkedName": "J"
@@ -33,8 +33,8 @@
   "pointTowardsZones": [],
   "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -48,7 +48,7 @@
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": -121.60750224624898
+    "rotation": -119.71497744813712
   },
   "useDefaultConstraints": true
 }

src/main/deploy/pathplanner/paths/K Approach.path

@@ -3,25 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 5.289041095890411,
-        "y": 2.9732020547945206
+        "x": 3.35655737704918,
+        "y": 5.78719262295082
       },
       "prevControl": null,
       "nextControl": {
-        "x": 5.950171232876712,
-        "y": 1.6208904109589037
+        "x": 3.402629510813402,
+        "y": 5.541474576217554
       },
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "Before K"
     },
     {
       "anchor": {
-        "x": 1.4424657534246574,
-        "y": 0.7944777397260271
+        "x": 3.6322745901639335,
+        "y": 5.019979508196721
       },
       "prevControl": {
-        "x": 2.389083904109589,
-        "y": 2.5374571917808213
+        "x": 3.596311475409835,
+        "y": 5.271721311475409
       },
       "nextControl": null,
       "isLocked": false,
@@ -33,8 +33,8 @@
   "pointTowardsZones": [],
   "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 1.0,
+    "maxAcceleration": 0.5,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -42,13 +42,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 54.162347045721745
+    "rotation": -60.94539590092286
   },
   "reversed": false,
   "folder": null,
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 120.96375653207336
+    "rotation": -59.69923999693802
   },
-  "useDefaultConstraints": true
+  "useDefaultConstraints": false
 }

src/main/deploy/pathplanner/paths/L Backup.path

@@ -3,49 +3,38 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 2.0,
-        "y": 7.0
+        "x": 3.6202868852459016,
+        "y": 5.031967213114754
       },
       "prevControl": null,
       "nextControl": {
-        "x": 3.0,
-        "y": 7.0
+        "x": 3.4877871502451065,
+        "y": 5.243966789116026
       },
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "L"
     },
     {
       "anchor": {
-        "x": 12.272,
-        "y": 2.975
+        "x": 1.1987704918032787,
+        "y": 7.189754098360656
       },
       "prevControl": {
-        "x": 10.940715672291898,
-        "y": 2.975
+        "x": 1.4025614754098363,
+        "y": 6.914036885245903
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "HP Left Position"
     }
   ],
   "rotationTargets": [],
   "constraintZones": [],
-  "pointTowardsZones": [
-    {
-      "fieldPosition": {
-        "x": 0.4,
-        "y": 5.5
-      },
-      "rotationOffset": 0.0,
-      "minWaypointRelativePos": 0.15,
-      "maxWaypointRelativePos": 0.4,
-      "name": "Point Towards Zone"
-    }
-  ],
+  "pointTowardsZones": [],
   "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 5.0,
+    "maxAcceleration": 2.5,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -53,13 +42,13 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": 59.99999999999999
+    "rotation": -53.97262661489646
   },
   "reversed": false,
-  "folder": null,
+  "folder": "Left Paths",
   "idealStartingState": {
     "velocity": 0,
-    "rotation": 0.0
+    "rotation": -59.69923999693802
   },
-  "useDefaultConstraints": true
+  "useDefaultConstraints": false
 }

src/main/deploy/pathplanner/paths/Right Start to E.path

@@ -3,29 +3,29 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 7.602996575342465,
-        "y": 2.0115582191780823
+        "x": 7.572945205479453,
+        "y": 0.4939640410958907
       },
       "prevControl": null,
       "nextControl": {
-        "x": 6.491095890410959,
-        "y": 1.9965325342465756
+        "x": 6.461044520547946,
+        "y": 0.4789383561643841
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 5.289041095890411,
-        "y": 2.9882277397260277
+        "x": 4.958476027397261,
+        "y": 2.837970890410959
       },
       "prevControl": {
-        "x": 6.130479452054795,
-        "y": 2.11673801369863
+        "x": 5.799914383561644,
+        "y": 1.9664811643835614
       },
       "nextControl": null,
       "isLocked": false,
-      "linkedName": null
+      "linkedName": "E"
     }
   ],
   "rotationTargets": [],
@@ -34,14 +34,26 @@
   "eventMarkers": [
     {
       "name": "Lift L4",
-      "waypointRelativePos": 0.7142857142857124,
+      "waypointRelativePos": 0.4261904761904757,
       "endWaypointRelativePos": null,
-      "command": null
+      "command": {
+        "type": "parallel",
+        "data": {
+          "commands": [
+            {
+              "type": "named",
+              "data": {
+                "name": "Lift L4"
+              }
+            }
+          ]
+        }
+      }
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/Start to 30 Right.path

@@ -3,25 +3,25 @@
   "waypoints": [
     {
       "anchor": {
-        "x": 7.587970890410959,
-        "y": 6.143621575342466
+        "x": 7.150967037968244,
+        "y": 7.5521014571037055
       },
       "prevControl": null,
       "nextControl": {
-        "x": 6.385916095890411,
-        "y": 6.158647260273973
+        "x": 5.916233431410867,
+        "y": 6.533146539070919
       },
       "isLocked": false,
       "linkedName": null
     },
     {
       "anchor": {
-        "x": 4.988527397260274,
-        "y": 5.227054794520548
+        "x": 4.974897540983607,
+        "y": 5.235758196721312
       },
       "prevControl": {
-        "x": 5.574529109589041,
-        "y": 6.098544520547945
+        "x": 5.560899253312374,
+        "y": 6.107247922748709
       },
       "nextControl": null,
       "isLocked": false,
@@ -34,14 +34,19 @@
   "eventMarkers": [
     {
       "name": "Lift L4",
-      "waypointRelativePos": 0.4547619047619047,
+      "waypointRelativePos": 0,
       "endWaypointRelativePos": null,
-      "command": null
+      "command": {
+        "type": "named",
+        "data": {
+          "name": "Lift L4"
+        }
+      }
     }
   ],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,
@@ -49,10 +54,10 @@
   },
   "goalEndState": {
     "velocity": 0,
-    "rotation": -121.60750224624898
+    "rotation": -119.71497744813712
   },
   "reversed": false,
-  "folder": null,
+  "folder": "Left Paths",
   "idealStartingState": {
     "velocity": 0,
     "rotation": -90.0

src/main/deploy/pathplanner/paths/Start to H.path

@@ -31,17 +31,10 @@
   "rotationTargets": [],
   "constraintZones": [],
   "pointTowardsZones": [],
-  "eventMarkers": [
-    {
-      "name": "Lift L4",
-      "waypointRelativePos": 0.08214624881291864,
-      "endWaypointRelativePos": null,
-      "command": null
-    }
-  ],
+  "eventMarkers": [],
   "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
+    "maxVelocity": 3.5,
+    "maxAcceleration": 1.75,
     "maxAngularVelocity": 540.0,
     "maxAngularAcceleration": 400.0,
     "nominalVoltage": 12.0,

src/main/deploy/pathplanner/paths/fein.path

@@ -1,70 +0,0 @@
-{
-  "version": "2025.0",
-  "waypoints": [
-    {
-      "anchor": {
-        "x": 7.600204918039607,
-        "y": 6.374590163938041
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 7.600204918032786,
-        "y": 7.573360655737705
-      },
-      "isLocked": false,
-      "linkedName": null
-    },
-    {
-      "anchor": {
-        "x": 6.209631147540984,
-        "y": 6.074897540983606
-      },
-      "prevControl": {
-        "x": 7.120696721311476,
-        "y": 6.074897540983606
-      },
-      "nextControl": {
-        "x": 4.745363537952068,
-        "y": 6.074897540983606
-      },
-      "isLocked": false,
-      "linkedName": null
-    },
-    {
-      "anchor": {
-        "x": 4.8670081967213115,
-        "y": 6.973975409836065
-      },
-      "prevControl": {
-        "x": 5.826024590163935,
-        "y": 6.9979508196721305
-      },
-      "nextControl": null,
-      "isLocked": false,
-      "linkedName": null
-    }
-  ],
-  "rotationTargets": [],
-  "constraintZones": [],
-  "pointTowardsZones": [],
-  "eventMarkers": [],
-  "globalConstraints": {
-    "maxVelocity": 4.0,
-    "maxAcceleration": 1.0,
-    "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 400.0,
-    "nominalVoltage": 12.0,
-    "unlimited": false
-  },
-  "goalEndState": {
-    "velocity": 0,
-    "rotation": 90.0
-  },
-  "reversed": false,
-  "folder": null,
-  "idealStartingState": {
-    "velocity": 0,
-    "rotation": 180.0
-  },
-  "useDefaultConstraints": true
-}

src/main/deploy/pathplanner/settings.json

@@ -2,10 +2,12 @@
   "robotWidth": 0.8763,
   "robotLength": 0.8763,
   "holonomicMode": true,
-  "pathFolders": [],
+  "pathFolders": [
+    "Left Paths"
+  ],
   "autoFolders": [],
-  "defaultMaxVel": 4.0,
-  "defaultMaxAccel": 1.0,
+  "defaultMaxVel": 3.5,
+  "defaultMaxAccel": 1.75,
   "defaultMaxAngVel": 540.0,
   "defaultMaxAngAccel": 400.0,
   "defaultNominalVoltage": 12.0,

src/main/java/frc/robot/RobotContainer.java

@@ -7,11 +7,9 @@ package frc.robot;
 import frc.robot.constants.ManipulatorPivotConstants;
 import frc.robot.constants.ClimberPivotConstants;
 import frc.robot.constants.ElevatorConstants;
-import frc.robot.constants.ManipulatorConstants;
 import frc.robot.constants.OIConstants;
 import frc.robot.constants.VisionConstants;
 import frc.robot.subsystems.ManipulatorPivot;
-import frc.robot.subsystems.Vision;
 import frc.robot.subsystems.ClimberPivot;
 import frc.robot.subsystems.ClimberRollers;
 import frc.robot.subsystems.Drivetrain;
@@ -22,9 +20,10 @@ import java.util.function.IntSupplier;
 
 import com.pathplanner.lib.auto.AutoBuilder;
 import com.pathplanner.lib.auto.NamedCommands;
-import com.pathplanner.lib.events.EventTrigger;
-import com.pathplanner.lib.path.EventMarker;
+import com.pathplanner.lib.commands.PathPlannerAuto;
 
+import edu.wpi.first.math.geometry.Rotation2d;
+import edu.wpi.first.math.util.Units;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInWidgets;
 import edu.wpi.first.wpilibj.shuffleboard.Shuffleboard;
 import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
@@ -43,6 +42,8 @@ public class RobotContainer {
 	private Elevator elevator;
 	//private ElevatorSysID elevator;
 
+	//private Indexer indexer;
+
 	private Manipulator manipulator;
 
 	private ManipulatorPivot manipulatorPivot;
@@ -52,8 +53,6 @@ public class RobotContainer {
 
 	private SendableChooser<Command> autoChooser;
 
-	private Vision vision;
-
 	private IntSupplier closestTag;
 
 	public RobotContainer() {
@@ -63,11 +62,11 @@ public class RobotContainer {
 
 		drivetrain = new Drivetrain();
 
-		vision = new Vision(drivetrain::getGyroValue);
-
 		elevator = new Elevator();
 		//elevator = new ElevatorSysID();
 
+		//indexer = new Indexer();
+
 		manipulator = new Manipulator();
 
 		manipulatorPivot = new ManipulatorPivot();
@@ -78,6 +77,9 @@ public class RobotContainer {
 		operator = new CommandXboxController(OIConstants.kOperatorControllerPort);
 
 		autoChooser = AutoBuilder.buildAutoChooser();
+		autoChooser.addOption("One Coral Left", new PathPlannerAuto("One Coral Left", true));
+		autoChooser.addOption("2.5 Coral Right", new PathPlannerAuto("2.5 Coral Left", true));
+		autoChooser.addOption("3 Coral Right", new PathPlannerAuto("3 Coral Left", true));
 
 		closestTag = drivetrain::getClosestTag;
 
@@ -109,8 +111,8 @@ public class RobotContainer {
 
 		drivetrain.setDefaultCommand(
 			drivetrain.drive(
-				() -> Math.pow(driver.getLeftY(), 3),
-				() -> Math.pow(driver.getLeftX(), 3),
+				() -> driver.getLeftY() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3),
+				() -> driver.getLeftX() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3),
 				driver::getRightX, //Math.signum(driver.getRightX()) * Math.pow(driver.getRightX(), 3)
 				() -> true
 			)
@@ -119,6 +121,10 @@ public class RobotContainer {
 		elevator.setDefaultCommand(
 			elevator.maintainPosition()
 		);
+
+		//indexer.setDefaultCommand(
+		//	indexer.runIndexer(() -> 0)
+		//);
 		
 		
 		manipulatorPivot.setDefaultCommand(
@@ -127,9 +133,7 @@ public class RobotContainer {
 		
 
 		manipulator.setDefaultCommand(
-			manipulator.runUntilCollected(
-				() -> 0.0
-			)
+			manipulator.runManipulator(() -> 0.0, false)
 		);
 
 		//Driver inputs
@@ -143,7 +147,10 @@ public class RobotContainer {
 		);
 
 		driver.leftTrigger().whileTrue( 
-			manipulator.runUntilCollected(() -> 0.75).andThen(manipulator.retractCommand(() -> 0.25))
+			manipulator.runUntilCollected(() -> 0.75)
+			//.alongWith(indexer.runIndexer(() -> .75))
+			.until(() -> manipulator.getCoralBeamBreak() == false)
+			.andThen(manipulator.retractCommand(() -> .1))
 		);
 
 		driver.start().and(driver.back()).onTrue(
@@ -153,24 +160,30 @@ public class RobotContainer {
 		driver.y().whileTrue(drivetrain.zeroHeading());
 		
 		driver.a().whileTrue(manipulator.runManipulator(() -> -0.5, false));
+
+		driver.b().whileTrue(manipulator.runManipulator(() -> -0.35, true));
+
+		driver.x().whileTrue(manipulator.runManipulator(() -> -0.2, true));
 		
-		/* 
+		driver.start().whileTrue(drivetrain.resetToVision());
+	
 		driver.rightBumper().whileTrue(
+				drivetrain.resetToVision().andThen(
 				drivetrain.goToPose(
 					() -> VisionConstants.reefSetpointsMap[closestTag.getAsInt()][2], 
 					() -> VisionConstants.reefSetpointsMap[closestTag.getAsInt()][3], 
-					() -> 360-VisionConstants.globalTagCoords[closestTag.getAsInt()][3]
-				)
+					() -> Rotation2d.fromRadians(Units.degreesToRadians(VisionConstants.globalTagCoords[closestTag.getAsInt()][3]+180))
+				))
 			);
 
 		driver.leftBumper().whileTrue(
+			drivetrain.resetToVision().andThen(
 			drivetrain.goToPose(
 				() -> VisionConstants.reefSetpointsMap[closestTag.getAsInt()][0], 
 				() -> VisionConstants.reefSetpointsMap[closestTag.getAsInt()][1], 
-				() -> 360-VisionConstants.globalTagCoords[closestTag.getAsInt()][3]
-			)
+				() -> Rotation2d.fromRadians(Units.degreesToRadians(VisionConstants.globalTagCoords[closestTag.getAsInt()][3]+180))
+			))
 		);
-		*/
 
 		//Operator inputs
 		operator.povUp().onTrue(
@@ -201,46 +214,141 @@ public class RobotContainer {
 			)
 		);
 
-		operator.start().toggleOnTrue(climberPivot.runPivot(() -> operator.getRightY()*0.5).alongWith(climberRollers.runRoller(() -> operator.getLeftY()*0.5)));
+		operator.back().onTrue(elevator.homeCommand());
+
+		operator.start().toggleOnTrue(
+			climberPivot.runPivot(() -> -operator.getRightY()*0.5)
+			.alongWith(climberRollers.runRoller(() -> operator.getLeftY()*0.5)));
 
 		operator.a().onTrue(
-			safeMoveManipulator(ElevatorConstants.kL1Position, 0.0)
+			safeMoveManipulator(ElevatorConstants.kCoralIntakePosition, ManipulatorPivotConstants.kStartingPosition)
 		);
 
 		operator.x().onTrue(
 			safeMoveManipulator(ElevatorConstants.kL2AlgaePosition, ManipulatorPivotConstants.kL2AlgaePosition)
-				.alongWith(manipulator.runManipulator(() -> 0.5, false))
+				.alongWith(manipulator.runManipulator(() -> 0.85, false))
 				.until(() -> driver.a().getAsBoolean())
 		);
 
 		operator.b().onTrue(
 			safeMoveManipulator(ElevatorConstants.kL3AlgaePosition, ManipulatorPivotConstants.kL3AlgaePosition)
-				.alongWith(manipulator.runManipulator(() -> 0.5, false))
+				.alongWith(manipulator.runManipulator(() -> 0.85, false))
 				.until(() -> driver.a().getAsBoolean())
 		);
 
 		operator.y().onTrue(moveWithAlgae(ElevatorConstants.kProcessorPosition, ManipulatorPivotConstants.kProcessorPosition)
-			.alongWith(manipulator.runManipulator(() -> 0.5, false))
+			.alongWith(manipulator.runManipulator(() -> 0.85, false))
 			.until(() -> driver.a().getAsBoolean())
 		);
 
+		operator.rightTrigger().onTrue(shootAlgae());
+
 	}
-
 	private void configureNamedCommands() {
-		new EventTrigger("Lift L4").onTrue(safeMoveManipulator(ElevatorConstants.kL4Position, ManipulatorPivotConstants.kL4Position));
-		new EventTrigger("HP Pickup").onTrue(safeMoveManipulator(ElevatorConstants.kL4Position, ManipulatorPivotConstants.kL4Position));
+		//new EventTrigger("Lift L4").onTrue(safeMoveManipulator(ElevatorConstants.kL4Position, ManipulatorPivotConstants.kL4Position));
+		//new EventTrigger("HP Pickup").onTrue(safeMoveManipulator(ElevatorConstants.kL4Position, ManipulatorPivotConstants.kL4Position));
 
-		NamedCommands.registerCommand("Drivetrain Set X", drivetrain.setXCommand());
-		NamedCommands.registerCommand("Shoot Coral L4", manipulator.runManipulator(() -> 0.4, true).withTimeout(2));
-		NamedCommands.registerCommand("Collect Coral", manipulator.runUntilCollected(() -> 0.35));
-		NamedCommands.registerCommand("Lift L4", safeMoveManipulator(ElevatorConstants.kL4Position, ManipulatorPivotConstants.kL4Position));
-		NamedCommands.registerCommand("HP Pickup", safeMoveManipulator(ElevatorConstants.kCoralIntakePosition, ManipulatorPivotConstants.kCoralIntakePosition));
+		NamedCommands.registerCommand(
+			"Drivetrain Set X", 
+			drivetrain.setXCommand()
+		);
+
+		NamedCommands.registerCommand(
+			"Shoot Coral L4", 
+			Commands.race(
+				manipulator.runManipulator(
+					() -> 0.4, 
+					true
+				).withTimeout(
+					0.5
+				).andThen(
+					manipulator.runManipulator(
+						() -> 0.0, 
+						false
+					).withTimeout(
+						0.01
+					)
+				), 
+				Commands.parallel(
+					elevator.maintainPosition(), 
+					manipulatorPivot.maintainPosition()
+				)
+			)
+		);
+
+		NamedCommands.registerCommand(
+			"Shoot Coral L4 Fast", 
+			Commands.race(
+				manipulator.runManipulator(
+					() -> 1,
+					true
+				).andThen(
+					manipulator.runManipulator(
+						() -> 1, 
+						true
+					).withTimeout(
+						0.125
+					)
+				).withTimeout(
+					3
+				).andThen(
+					manipulator.runManipulator(
+						() -> 0, 
+						true
+					)
+				), 
+				Commands.parallel(
+					elevator.maintainPosition(), 
+					manipulatorPivot.maintainPosition()
+				)
+			)
+		);
+
+		NamedCommands.registerCommand(
+			"Collect Coral", 
+			manipulator.runUntilCollected(
+				() -> 0.30
+			).andThen(
+				manipulator.runManipulator(
+					() -> 0, 
+					false
+				).withTimeout(
+					0.01
+				)
+			)
+		);
+
+		NamedCommands.registerCommand(
+			"Lift L4", 
+			safeMoveManipulator(
+				ElevatorConstants.kL4Position, 
+				ManipulatorPivotConstants.kL4Position
+			).andThen(
+				elevator.maintainPosition()
+					.withTimeout(
+						0.1
+					), 
+				manipulatorPivot.maintainPosition()
+					.withTimeout(
+						0.01
+					)
+			)
+		);
+
+		NamedCommands.registerCommand(
+			"HP Pickup", 
+			safeMoveManipulator(
+				ElevatorConstants.kCoralIntakePosition, 
+				ManipulatorPivotConstants.kStartingPosition
+			)
+		);
 	}
 
 	//creates tabs and transforms them on the shuffleboard
     private void configureShuffleboard() {
 		ShuffleboardTab autoTab = Shuffleboard.getTab(OIConstants.kAutoTab);
     	ShuffleboardTab sensorTab = Shuffleboard.getTab(OIConstants.kSensorsTab);
+		ShuffleboardTab apriltagTab = Shuffleboard.getTab(OIConstants.kApriltagTab);
 
 		Shuffleboard.selectTab(OIConstants.kAutoTab);
 
@@ -252,7 +360,7 @@ public class RobotContainer {
 		sensorTab.addDouble("Elevator Position", elevator::getEncoderPosition)
 			.withSize(2, 1)
 			.withPosition(0, 0)
-			.withWidget(BuiltInWidgets.kGraph);
+			.withWidget(BuiltInWidgets.kTextView);
 
 		sensorTab.addDouble("Manipulator Position", manipulatorPivot::getEncoderPosition)
 			.withSize(2, 1)
@@ -307,15 +415,48 @@ public class RobotContainer {
 
 		sensorTab.addDouble("manipulator output", manipulatorPivot::getPivotOutput);
 
-		sensorTab.addDouble("manipulator cg position", manipulatorPivot::getCGPosition);
-
-		sensorTab.addDouble("dt distance", drivetrain::driveDistance);
-
 		sensorTab.addDouble("velocity", drivetrain::getVelocity);
 
+		sensorTab.addDouble("heading", drivetrain::getHeading);
+
 
 		//sensorTab.add("odometry", drivetrain::getPose);
 
+		apriltagTab.addDouble("Orange ID", () -> drivetrain.vision.getOrangeClosestTag())
+			.withSize(1,1).withPosition(1,1);
+		apriltagTab.addDouble("Orange tx", () -> drivetrain.vision.getOrangeTX())
+			.withSize(1,1).withPosition(2,1);
+		apriltagTab.addDouble("Orange ty", () -> drivetrain.vision.getOrangeTY())
+			.withSize(1,1).withPosition(3,1);
+		apriltagTab.addDouble("Orange dist", () -> drivetrain.vision.getOrangeDist())
+			.withSize(1,1).withPosition(4,1);
+		apriltagTab.addDouble("orange fps", () -> drivetrain.vision.getOrangeFPS())
+			.withSize(1,1).withPosition(5,1);
+		apriltagTab.addBoolean("orange detected", () -> drivetrain.vision.getOrangeTagDetected())
+			.withSize(1,1).withPosition(6,1);
+
+		apriltagTab.addDouble("Black ID", () -> drivetrain.vision.getBlackClosestTag())
+			.withSize(1,1).withPosition(1,2);
+		apriltagTab.addDouble("Black tx", () -> drivetrain.vision.getBlackTX())
+			.withSize(1,1).withPosition(2,2);
+		apriltagTab.addDouble("Black ty", () -> drivetrain.vision.getBlackTY())
+			.withSize(1,1).withPosition(3,2);
+		apriltagTab.addDouble("Black dist", () -> drivetrain.vision.getBlackDist())
+			.withSize(1,1).withPosition(4,2);
+		apriltagTab.addDouble("Black fps", () -> drivetrain.vision.getBlackFPS())
+			.withSize(1,1).withPosition(5,2);
+		apriltagTab.addBoolean("Black detected", () -> drivetrain.vision.getBlackTagDetected())
+			.withSize(1,1).withPosition(6,2);
+
+		apriltagTab.addDouble("Closest tag", () -> drivetrain.getClosestTag())
+			.withSize(2,1).withPosition(4,4);
+
+		apriltagTab.addBoolean("Is orange connected?", () -> drivetrain.vision.isOrangeConnected())
+			.withSize(2, 1).withPosition(4, 2);
+		apriltagTab.addBoolean("Is black connected?", () -> drivetrain.vision.isBlackConnected())
+			.withSize(2, 1).withPosition(6, 2);
+
+
  	}
 
 	public Command getAutonomousCommand() {
@@ -456,6 +597,14 @@ public class RobotContainer {
 		.raceWith(elevator.maintainPosition()));
 	}
 
+	private Command shootAlgae(){
+		return manipulatorPivot.goToSetpoint(() -> ManipulatorPivotConstants.kBargeShotPosition)
+		.andThen(elevator.goToSetpoint(() -> ElevatorConstants.kL4Position), manipulatorPivot.goToSetpoint(() -> ManipulatorPivotConstants.kBargeShotPosition)
+		.raceWith(elevator.maintainPosition())).until(() -> elevator.getEncoderPosition()>44).andThen(manipulator.runManipulator(() -> -1, false),
+		elevator.goToSetpoint(() -> ElevatorConstants.kL4Position), manipulatorPivot.goToSetpoint(() -> ManipulatorPivotConstants.kBargeShotPosition)
+		.raceWith(elevator.maintainPosition()));
+	}
+
 	@SuppressWarnings("unused")
 	private Command startingConfig() {
 		return moveManipulatorUtil(0, 0, false, true)

src/main/java/frc/robot/constants/AutoConstants.java

@@ -11,25 +11,30 @@ import com.pathplanner.lib.controllers.PPHolonomicDriveController;
 import edu.wpi.first.math.trajectory.TrapezoidProfile;
 
 public class AutoConstants {
-    public static final double kMaxSpeedMetersPerSecond = 4;
-    public static final double kMaxAccelerationMetersPerSecondSquared = 1;
+    public static final double kMaxSpeedMetersPerSecond = 5;
+    public static final double kMaxAccelerationMetersPerSecondSquared = 4;
     public static final double kMaxAngularSpeedRadiansPerSecond = Math.PI;
     public static final double kMaxAngularSpeedRadiansPerSecondSquared = Math.PI;
 
-    public static final double kPXController = 6;
-    public static final double kPYController = 6;
-    public static final double kPThetaController = 5.5;
+    public static final double kPXYController = 3.5;
+    public static final double kPThetaController = 5;
+
+    public static final double kAlignPXYController = 2;
+    public static final double kAlignPThetaController = 5;
 
     // Constraint for the motion profiled robot angle controller
     public static final TrapezoidProfile.Constraints kThetaControllerConstraints = new TrapezoidProfile.Constraints(
         kMaxAngularSpeedRadiansPerSecond, kMaxAngularSpeedRadiansPerSecondSquared);
 
+    public static final TrapezoidProfile.Constraints kAlignThetaControllerConstraints = new TrapezoidProfile.Constraints(
+        kMaxAngularSpeedRadiansPerSecond, kMaxAngularSpeedRadiansPerSecondSquared);
+
     // TODO This is a constant being managed like a static rewriteable variable
     public static RobotConfig kRobotConfig;
 
     public static final PPHolonomicDriveController kPPDriveController = new PPHolonomicDriveController(
-        new PIDConstants(kPXController, 0, 0),
-        new PIDConstants(kPYController, 0, 0)
+        new PIDConstants(kPXYController, 0, 0),
+        new PIDConstants(kPThetaController, 0, 0)
     );
 
     static {

src/main/java/frc/robot/constants/DrivetrainConstants.java

@@ -29,10 +29,10 @@ public class DrivetrainConstants {
     public static final double kBackRightChassisAngularOffset = 0;
 */
 
-    public static final double kFrontLeftChassisAngularOffset = 0;
-    public static final double kFrontRightChassisAngularOffset = Math.PI / 2;
-    public static final double kBackLeftChassisAngularOffset = -Math.PI / 2;
-    public static final double kBackRightChassisAngularOffset = Math.PI;
+    public static final double kFrontLeftChassisAngularOffset = Math.PI;
+    public static final double kFrontRightChassisAngularOffset = -Math.PI / 2;
+    public static final double kBackLeftChassisAngularOffset = Math.PI / 2;
+    public static final double kBackRightChassisAngularOffset = 0;
 
     // 1, 7, 10 is the default for these three values
     public static final double kSysIDDrivingRampRate = 1;
@@ -57,10 +57,10 @@ public class DrivetrainConstants {
 
     public static final boolean kGyroReversed = true;
 
-    public static final double kHeadingP = 0.0;
+    public static final double kHeadingP = 0.1;
 
-    public static final double kXTranslationP = 0.0;
-    public static final double kYTranslationP = 0.0;
+    public static final double kXTranslationP = 0.5;
+    public static final double kYTranslationP = 0.5;
 
 
     // YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS LINE UNLESS YOU'RE ADDING A NEW CONFIGURATION ITEM

src/main/java/frc/robot/constants/ElevatorConstants.java

@@ -42,9 +42,9 @@ public class ElevatorConstants {
     public static final double kMaxAcceleration = 240;    // 400 inches per second^2 (also COOKING) calculated max is 600 in/s^2
 
     public static final double kCoralIntakePosition = 0;
-    public static final double kL1Position = 0;
-    public static final double kL2Position = 9;
-    public static final double kL3Position = 23.0;
+    public static final double kL1Position = 17;
+    public static final double kL2Position = 11;
+    public static final double kL3Position = 27;
     public static final double kL4Position = 50.5;
     public static final double kL4TransitionPosition = 40.0;
     public static final double kL2AlgaePosition = 23.0;

src/main/java/frc/robot/constants/IndexerConstants.java

@@ -0,0 +1,15 @@
+package frc.robot.constants;
+
+import com.revrobotics.spark.config.SparkBaseConfig.IdleMode;
+import com.revrobotics.spark.config.SparkMaxConfig;
+
+public class IndexerConstants {
+    public static final int kIndexerMotorID = 16;
+
+    public static final SparkMaxConfig motorConfig = new SparkMaxConfig();
+    
+    static{
+        motorConfig.smartCurrentLimit(30)
+        .idleMode(IdleMode.kBrake);
+    };
+}

src/main/java/frc/robot/constants/ManipulatorConstants.java

@@ -1,5 +1,6 @@
 package frc.robot.constants;
 
+import com.revrobotics.spark.config.SparkBaseConfig.IdleMode;
 import com.revrobotics.spark.config.SparkMaxConfig;
 
 public class ManipulatorConstants {
@@ -7,4 +8,9 @@ public class ManipulatorConstants {
     public static final int kCoralBeamBreakID = 2;
     
     public static final SparkMaxConfig motorConfig = new SparkMaxConfig();
+    
+    static{
+        motorConfig.smartCurrentLimit(40)
+        .idleMode(IdleMode.kBrake);
+    };
 }

src/main/java/frc/robot/constants/ManipulatorPivotConstants.java

@@ -20,7 +20,7 @@ public class ManipulatorPivotConstants {
 
     public static final double kPivotMaxVelocity = 2 * Math.PI;
 
-    public static final double kPositionalP = 4;
+    public static final double kPositionalP = 4.5;
     public static final double kPositionalI = 0;
     public static final double kPositionalD = 0;
     public static final double kPositionalTolerance = Units.degreesToRadians(1.5);
@@ -29,26 +29,29 @@ public class ManipulatorPivotConstants {
     public static final double kFeedForwardG = (0.3+0.19) / 2; // calculated value 0.41
     public static final double kFeedForwardV = 0.68; //calculated value 0.68
 
-    public static final double kFFGravityOffset = Units.degreesToRadians(135.0);
+    public static final double kFFGravityOffset = Units.degreesToRadians(135.0+90);
 
     public static final double kMaxAcceleration = Units.degreesToRadians(1000.0); // degrees per second^2 calculated max = 2100
     public static final double kMaxVelocity = Units.degreesToRadians(100.0); // degrees per second calculated max = 168
 
-    public static final double kEncoderOffset = 0.780;
+    public static final double kEncoderOffset = 0.04500000178813934;
 
-    public static final double kCoralIntakePosition = Units.degreesToRadians(175.0);
-    public static final double kL1Position = Units.degreesToRadians(0.0);
-    public static final double kL2Position = Units.degreesToRadians(22.0);
-    public static final double kL3Position = Units.degreesToRadians(22.0);
-    public static final double kL4Position = Units.degreesToRadians(45.0);
-    public static final double kL2AlgaePosition = Units.degreesToRadians(175.0);
-    public static final double kL3AlgaePosition = Units.degreesToRadians(175.0);
-    public static final double kProcessorPosition = Units.degreesToRadians(175.0);
-    public static final double kNetPosition = Units.degreesToRadians(175.0);
+    public static final double kStartingPosition = Units.degreesToRadians(90);
+    public static final double kCoralIntakePosition = Units.degreesToRadians(175.0+90);
+    public static final double kL1Position = Units.degreesToRadians(246);
+    public static final double kL2Position = Units.degreesToRadians(22.0+90);
+    public static final double kL3Position = Units.degreesToRadians(22.0+90);
+    public static final double kL4Position = Units.degreesToRadians(45.0+90);
+    public static final double kL2AlgaePosition = Units.degreesToRadians(175.0+90);
+    public static final double kL3AlgaePosition = Units.degreesToRadians(175.0+90);
+    public static final double kProcessorPosition = Units.degreesToRadians(175.0+90);
+    public static final double kNetPosition = Units.degreesToRadians(175.0+90);
     /**The closest position to the elevator brace without hitting it */
-    public static final double kPivotSafeStowPosition = Units.degreesToRadians(71.0);
+    public static final double kPivotSafeStowPosition = Units.degreesToRadians(71.0+90);
+
+    public static final double kBargeShotPosition = Units.degreesToRadians(222);
     /**The forward rotation limit of the pivot */
-    public static final double kRotationLimit = Units.degreesToRadians(175.0);
+    public static final double kRotationLimit = Units.degreesToRadians(175.0+90);
 
     public static final double kSysIDRampRate = 1;
     public static final double kSysIDStepVolts = 7;

src/main/java/frc/robot/constants/ModuleConstants.java

@@ -48,7 +48,7 @@ public class ModuleConstants {
 
     public static final IdleMode kTurnIdleMode = IdleMode.kBrake;
 
-    public static final InvertedValue kDriveInversionState = InvertedValue.CounterClockwise_Positive;
+    public static final InvertedValue kDriveInversionState = InvertedValue.Clockwise_Positive;
     public static final NeutralModeValue kDriveIdleMode = NeutralModeValue.Brake;
 
     // YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS LINE UNLESS YOU'RE ADDING A NEW CONFIGURATION ITEM 

src/main/java/frc/robot/constants/OIConstants.java

@@ -4,8 +4,9 @@ public class OIConstants {
     public static final int kDriverControllerPort = 0;
     public static final int kOperatorControllerPort = 1;
     
-    public static final double kDriveDeadband = 0.05;
+    public static final double kDriveDeadband = Math.pow(0.05, 3);
 
     public static final String kAutoTab = "Auto Tab";
     public static final String kSensorsTab = "Sensors Tab";
+    public static final String kApriltagTab = "Apriltag Tab";
 }

src/main/java/frc/robot/constants/VisionConstants.java

@@ -40,12 +40,12 @@ public class VisionConstants {
         {},
         {},
         {},
-        {4.993+12.272, 2.816, 5.272+12.272, 2.996},//6
-        {5.789+12.272, 3.862, 5.789+12.272, 4.194},
-        {5.275+12.272, 5.075, 4.991+12.272, 5.246},
-        {3.986+12.272, 5.24, 3.701+12.272, 5.076},
-        {3.183+12.272, 4.191, 3.183, 3.857},
-        {3.703+12.272, 3.975, 3.982+12.272, 2.806},//11
+        {13.570, 2.816, 13.858, 2.970},//6
+        {14.373, 3.862, 14.385, 4.194},
+        {13.858, 5.032, 13.558, 5.227},
+        {12.575, 5.227, 12.287, 5.056},
+        {11.772, 4.169, 11.772, 3.845},
+        {12.287, 2.982, 12.587, 2.826},//11
         {},
         {},
         {},
@@ -54,9 +54,11 @@ public class VisionConstants {
         {3.703, 3.975, 3.982, 2.806},
         {3.183, 4.191, 3.183, 3.857},
         {3.986, 5.24, 3.701, 5.076},
-        {5.275, 5.075, 4.991, 5.246},
+        {5.275, 5.075, 4.891, 5.284},//4.991, 5.246},
         {5.789, 3.862, 5.789, 4.194},
         {4.993, 2.816, 5.272, 2.996}
     };
 
+    public static final double latencyFudge = 0.0;
+
 }

src/main/java/frc/robot/subsystems/Drivetrain.java

@@ -8,6 +8,9 @@ import java.io.File;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
 import java.util.function.DoubleSupplier;
+import java.util.function.Supplier;
+
+import org.littletonrobotics.junction.Logger;
 
 import com.ctre.phoenix6.Orchestra;
 import com.pathplanner.lib.auto.AutoBuilder;
@@ -15,15 +18,22 @@ import com.studica.frc.AHRS;
 import com.studica.frc.AHRS.NavXComType;
 
 import edu.wpi.first.math.MathUtil;
+import edu.wpi.first.math.VecBuilder;
+import edu.wpi.first.math.controller.HolonomicDriveController;
 import edu.wpi.first.math.controller.PIDController;
+import edu.wpi.first.math.controller.ProfiledPIDController;
 import edu.wpi.first.math.estimator.SwerveDrivePoseEstimator;
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.math.geometry.Rotation2d;
+import edu.wpi.first.math.geometry.Translation2d;
+import edu.wpi.first.math.interpolation.TimeInterpolatableBuffer;
 import edu.wpi.first.math.kinematics.ChassisSpeeds;
 import edu.wpi.first.math.kinematics.SwerveDriveKinematics;
 import edu.wpi.first.math.kinematics.SwerveModulePosition;
 import edu.wpi.first.math.kinematics.SwerveModuleState;
+import edu.wpi.first.math.util.Units;
 import edu.wpi.first.wpilibj.DriverStation;
+import edu.wpi.first.wpilibj.DriverStation.Alliance;
 import edu.wpi.first.wpilibj.Filesystem;
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj2.command.Command;
@@ -32,6 +42,7 @@ import frc.robot.constants.AutoConstants;
 import frc.robot.constants.DrivetrainConstants;
 import frc.robot.constants.OIConstants;
 import frc.robot.constants.VisionConstants;
+import edu.wpi.first.math.geometry.Pose3d;
 
 public class Drivetrain extends SubsystemBase {
     // Create MAXSwerveModules
@@ -45,14 +56,23 @@ public class Drivetrain extends SubsystemBase {
 
     // Odometry class for tracking robot pose
     private SwerveDrivePoseEstimator m_estimator;
+    
+    private TimeInterpolatableBuffer<Double> gyroBuffer = TimeInterpolatableBuffer.createDoubleBuffer(2.0);
 
     public Orchestra m_orchestra = new Orchestra();
     private Timer musicTimer = new Timer();
 
-    private PIDController pidHeading;
+    private ProfiledPIDController pidHeading;
     private PIDController pidTranslationX;
     private PIDController pidTranslationY;
 
+    private HolonomicDriveController driveController;
+
+    public Vision vision;
+
+    public Pose2d orangePose2d;
+    public Pose2d blackPose2d;
+
     /** Creates a new DriveSubsystem. */
     public Drivetrain() {
         m_frontLeft = new MAXSwerveModule(
@@ -90,14 +110,21 @@ public class Drivetrain extends SubsystemBase {
                 m_rearLeft.getPosition(),
                 m_rearRight.getPosition()
             },
-            new Pose2d()
+            new Pose2d(),
+            VecBuilder.fill(0.1, 0.1, Units.degreesToRadians(5)),
+            VecBuilder.fill(1, 1, Units.degreesToRadians(360))
         );
 
-        pidHeading = new PIDController(DrivetrainConstants.kHeadingP,0,0);
-        pidHeading.enableContinuousInput(-180, 180);
+        pidHeading = new ProfiledPIDController(AutoConstants.kAlignPThetaController, 0, 0, AutoConstants.kAlignThetaControllerConstraints);
+        pidHeading.setTolerance(Units.degreesToRadians(3));
+        pidHeading.enableContinuousInput(-Units.degreesToRadians(180), Units.degreesToRadians(180));
 
-        pidTranslationX = new PIDController(DrivetrainConstants.kXTranslationP,0,0);
-        pidTranslationY = new PIDController(DrivetrainConstants.kYTranslationP,0,0);
+        pidTranslationX = new PIDController(AutoConstants.kAlignPXYController,0,0);
+        pidTranslationX.setTolerance(Units.inchesToMeters(0.5));
+        pidTranslationY = new PIDController(AutoConstants.kAlignPXYController,0,0);
+        pidTranslationY.setTolerance(Units.inchesToMeters(0.5));
+
+        driveController = new HolonomicDriveController(pidTranslationX, pidTranslationY, pidHeading);
 
         AutoBuilder.configure(
             this::getPose, 
@@ -130,6 +157,10 @@ public class Drivetrain extends SubsystemBase {
         m_orchestra.play();
         musicTimer.reset();
         musicTimer.start();
+
+        vision = new Vision();
+        orangePose2d = new Pose2d();
+        blackPose2d = new Pose2d();
     }
 
     @Override
@@ -144,24 +175,47 @@ public class Drivetrain extends SubsystemBase {
                 m_rearRight.getPosition()
         });
 
+        gyroBuffer.addSample(Timer.getFPGATimestamp(), m_estimator.getEstimatedPosition().getRotation().getDegrees());
 
-        // if the detected tags match your alliances reef tags use their pose estimates 
-        /* 
-        if(vision.getOrangeClosestTag() >= 6 || vision.getOrangeClosestTag() <= 11 || DriverStation.getAlliance().equals(Alliance.Red)){
-            m_estimator.addVisionMeasurement(vision.getOrangeGlobalPose(), vision.getOrangeTimeStamp());
-            
-        }else if(vision.getOrangeClosestTag() >= 17 || vision.getOrangeClosestTag() <= 22 || DriverStation.getAlliance().equals(Alliance.Blue)){
-            m_estimator.addVisionMeasurement(vision.getOrangeGlobalPose(), vision.getOrangeTimeStamp());
-        }
+        m_estimator.setVisionMeasurementStdDevs(VecBuilder.fill(0.3, 0.3, Units.degreesToRadians(360)));
 
-        if(vision.getBlackClosestTag() >= 6 || vision.getBlackClosestTag() <= 11 || DriverStation.getAlliance().equals(Alliance.Red)){
-            m_estimator.addVisionMeasurement(vision.getBlackGlobalPose(), vision.getBlackTimeStamp()); 
-        }else if(vision.getBlackClosestTag() >= 17 || vision.getBlackClosestTag() <= 22 || DriverStation.getAlliance().equals(Alliance.Blue)){
-            m_estimator.addVisionMeasurement(vision.getBlackGlobalPose(), vision.getBlackTimeStamp());
+        if(vision.getOrangeTagDetected() && vision.getOrangeTagDetected()){
+            if(vision.getOrangeDist() < 60){
+                m_estimator.setVisionMeasurementStdDevs(VecBuilder.fill(0.1, 0.1, Units.degreesToRadians(360)));
+            }
+
+            // if the detected tags match your alliances reef tags use their pose estimates  
+            if(vision.getOrangeClosestTag() >= 6 && vision.getOrangeClosestTag() <= 11 && DriverStation.getAlliance().get().equals(Alliance.Red) && vision.getOrangeTagDetected()){
+                orangePose2d = vision.getOrangeGlobalPose(gyroBuffer);
+                m_estimator.addVisionMeasurement(orangePose2d, vision.getOrangeTimeStamp());
+
+            }else if(vision.getOrangeClosestTag() >= 17 && vision.getOrangeClosestTag() <= 22 && DriverStation.getAlliance().get().equals(Alliance.Blue) && vision.getOrangeTagDetected()){
+                orangePose2d = vision.getOrangeGlobalPose(gyroBuffer);
+                m_estimator.addVisionMeasurement(orangePose2d, vision.getOrangeTimeStamp());
+            } 
         }
-        */
+        Logger.recordOutput("orange pose", new Pose3d(orangePose2d));
+
+
+        if(vision.getBlackTagDetected() && vision.getBlackTagDetected()){
+            if(vision.getBlackDist() < 60){
+                m_estimator.setVisionMeasurementStdDevs(VecBuilder.fill(0.1, 0.1, Units.degreesToRadians(360)));
+            }
+
+            if(vision.getBlackClosestTag() >= 6 && vision.getBlackClosestTag() <= 11 && DriverStation.getAlliance().get().equals(Alliance.Red) && vision.getBlackTagDetected()){
+                blackPose2d = vision.getBlackGlobalPose(gyroBuffer);
+                m_estimator.addVisionMeasurement(blackPose2d, vision.getBlackTimeStamp()); 
+
+            }else if(vision.getBlackClosestTag() >= 17 && vision.getBlackClosestTag() <= 22 && DriverStation.getAlliance().get().equals(Alliance.Blue) && vision.getBlackTagDetected()){
+                blackPose2d = vision.getBlackGlobalPose(gyroBuffer);
+                m_estimator.addVisionMeasurement(blackPose2d, vision.getBlackTimeStamp());
+            }
+        }
+        Logger.recordOutput("black pose", new Pose3d(blackPose2d));
         
-        if(musicTimer.get()>20){
+        Logger.recordOutput("robot pose", new Pose3d(m_estimator.getEstimatedPosition()));
+        
+        if(musicTimer.get()>10){
             if (m_orchestra.isPlaying()) {
                 m_orchestra.stop();
             }
@@ -203,14 +257,15 @@ public class Drivetrain extends SubsystemBase {
      * @param pose The pose to which to set the odometry.
      */
     public void resetOdometry(Pose2d pose) {
+
         m_estimator.resetPosition(
-            Rotation2d.fromDegrees(getGyroValue()), 
+            Rotation2d.fromDegrees(getGyroValue()),
             new SwerveModulePosition[] {
                 m_frontLeft.getPosition(),
                 m_frontRight.getPosition(),
                 m_rearLeft.getPosition(),
                 m_rearRight.getPosition()
-            }, 
+            },
             pose
         );
     }
@@ -218,12 +273,20 @@ public class Drivetrain extends SubsystemBase {
     public Command drive(DoubleSupplier xSpeed, DoubleSupplier ySpeed, DoubleSupplier rot,
             BooleanSupplier fieldRelative) {
         return run(() -> {
-            drive(
-                -MathUtil.applyDeadband(xSpeed.getAsDouble(), OIConstants.kDriveDeadband),
-                -MathUtil.applyDeadband(ySpeed.getAsDouble(), OIConstants.kDriveDeadband),
-                -MathUtil.applyDeadband(rot.getAsDouble(), OIConstants.kDriveDeadband),
-                fieldRelative.getAsBoolean()
-            );
+            if(DriverStation.getAlliance().get().equals(Alliance.Blue)){
+                drive(
+                    -MathUtil.applyDeadband(xSpeed.getAsDouble(), OIConstants.kDriveDeadband),
+                    -MathUtil.applyDeadband(ySpeed.getAsDouble(), OIConstants.kDriveDeadband),
+                    -MathUtil.applyDeadband(rot.getAsDouble(), OIConstants.kDriveDeadband),
+                    fieldRelative.getAsBoolean()
+                );
+            }else{
+                drive(
+                    MathUtil.applyDeadband(xSpeed.getAsDouble(), OIConstants.kDriveDeadband),
+                    MathUtil.applyDeadband(ySpeed.getAsDouble(), OIConstants.kDriveDeadband),
+                    -MathUtil.applyDeadband(rot.getAsDouble(), OIConstants.kDriveDeadband),
+                    fieldRelative.getAsBoolean()
+            );}
         });
     }
 
@@ -245,7 +308,7 @@ public class Drivetrain extends SubsystemBase {
         var swerveModuleStates = DrivetrainConstants.kDriveKinematics.toSwerveModuleStates(
             fieldRelative
                 ? ChassisSpeeds.fromFieldRelativeSpeeds(xSpeedDelivered, ySpeedDelivered, rotDelivered,
-                        Rotation2d.fromDegrees(getGyroValue()))
+                        new Rotation2d(m_estimator.getEstimatedPosition().getRotation().getRadians()))
                 : new ChassisSpeeds(xSpeedDelivered, ySpeedDelivered, rotDelivered));
         SwerveDriveKinematics.desaturateWheelSpeeds(
             swerveModuleStates, DrivetrainConstants.kMaxSpeedMetersPerSecond);
@@ -261,25 +324,46 @@ public class Drivetrain extends SubsystemBase {
         });
     }
 
-    public Command goToPose(DoubleSupplier xSetpoint, DoubleSupplier ySetpoint, DoubleSupplier headingSetpoint){
-        return run(() -> {
-            drive(pidTranslationX.calculate(m_estimator.getEstimatedPosition().getX(), xSetpoint.getAsDouble()),
-                pidTranslationY.calculate(m_estimator.getEstimatedPosition().getY(), ySetpoint.getAsDouble()), 
-                pidHeading.calculate(getHeading(), headingSetpoint.getAsDouble()), 
-                true);
+    public Command goToPose(DoubleSupplier xSetpoint, DoubleSupplier ySetpoint, Supplier<Rotation2d> headingSetpoint){
+        return startRun(() -> {
+                pidTranslationX.reset();
+                pidTranslationY.reset();
+                pidHeading.reset(m_estimator.getEstimatedPosition().getRotation().getRadians(), gyro.getVelocityZ());
+            },
+            () -> {
+                    ChassisSpeeds controlEffort = driveController.calculate(
+                    m_estimator.getEstimatedPosition(),
+                    new Pose2d(xSetpoint.getAsDouble(), ySetpoint.getAsDouble(),
+                    headingSetpoint.get()),
+                    0,
+                    headingSetpoint.get()
+                );
+
+                double speed = Math.hypot(controlEffort.vxMetersPerSecond, controlEffort.vyMetersPerSecond);
+                if (speed > AutoConstants.kMaxSpeedMetersPerSecond) {
+                    double mul = AutoConstants.kMaxSpeedMetersPerSecond / speed;
+                    controlEffort.vxMetersPerSecond *= mul;
+                    controlEffort.vyMetersPerSecond *= mul;
+                }
+
+                driveWithChassisSpeeds(controlEffort);
+
+                Logger.recordOutput("reef setpoint", new Pose3d(new Pose2d(
+                    new Translation2d(xSetpoint.getAsDouble(), ySetpoint.getAsDouble()),
+                    headingSetpoint.get())));
             });
     }
 
     public int getClosestTag(){
 
-		if(DriverStation.getAlliance().equals(DriverStation.Alliance.Blue)){
+		if(DriverStation.getAlliance().get().equals(DriverStation.Alliance.Blue)){
 			int closestTag = 17;
-			double closestTagDist = Math.sqrt(Math.pow(getPose().getX()-VisionConstants.globalTagCoords[17][0], 2)
-			+ Math.pow(getPose().getY()-VisionConstants.globalTagCoords[17][1], 2));
+			double closestTagDist = Math.sqrt(Math.pow(getPose().getX()- Units.inchesToMeters(VisionConstants.globalTagCoords[17][0]), 2)
+			+ Math.pow(getPose().getY()- Units.inchesToMeters(VisionConstants.globalTagCoords[17][1]), 2));
 			
 			for(int i = 17; i <= 22; ++i){
-				double distance = Math.sqrt(Math.pow(getPose().getX()-VisionConstants.globalTagCoords[i][0], 2)
-				+ Math.pow(getPose().getY()-VisionConstants.globalTagCoords[i][1], 2));
+				double distance = Math.sqrt(Math.pow(getPose().getX()- Units.inchesToMeters(VisionConstants.globalTagCoords[i][0]), 2)
+				+ Math.pow(getPose().getY()- Units.inchesToMeters(VisionConstants.globalTagCoords[i][1]), 2));
 
 				if(distance < closestTagDist){
 					closestTag = i;
@@ -289,12 +373,12 @@ public class Drivetrain extends SubsystemBase {
 			return closestTag;
 		}else{
 			int closestTag = 6;
-			double closestTagDist = Math.sqrt(Math.pow(getPose().getX()-VisionConstants.globalTagCoords[17][0], 2)
-			+ Math.pow(getPose().getY()-VisionConstants.globalTagCoords[17][1], 2));
+			double closestTagDist = Math.sqrt(Math.pow(m_estimator.getEstimatedPosition().getX()- Units.inchesToMeters(VisionConstants.globalTagCoords[6][0]), 2)
+			+ Math.pow(m_estimator.getEstimatedPosition().getY()- Units.inchesToMeters(VisionConstants.globalTagCoords[6][1]), 2));
 			
 			for(int i = 6; i <= 11; ++i){
-				double distance = Math.sqrt(Math.pow(getPose().getX()-VisionConstants.globalTagCoords[i][0], 2)
-				+ Math.pow(getPose().getY()-VisionConstants.globalTagCoords[i][1], 2));
+				double distance = Math.sqrt(Math.pow(m_estimator.getEstimatedPosition().getX()- Units.inchesToMeters( VisionConstants.globalTagCoords[i][0]), 2)
+				+ Math.pow(m_estimator.getEstimatedPosition().getY()- Units.inchesToMeters(VisionConstants.globalTagCoords[i][1]), 2));
 
 				if(distance < closestTagDist){
 					closestTag = i;
@@ -342,6 +426,7 @@ public class Drivetrain extends SubsystemBase {
     public Command zeroHeading() {
         return run(() -> {
             gyro.reset();
+            m_estimator.resetRotation(new Rotation2d(0));
         });
     }
 
@@ -355,7 +440,11 @@ public class Drivetrain extends SubsystemBase {
      * @return the robot's heading in degrees, from -180 to 180
      */
     public double getHeading() {
-        return Rotation2d.fromDegrees(getGyroValue()).getDegrees();
+        return m_estimator.getEstimatedPosition().getRotation().getDegrees();
+    }
+
+    public TimeInterpolatableBuffer<Double> getGyroBuffer(){
+        return gyroBuffer;
     }
 
     /**
@@ -367,15 +456,17 @@ public class Drivetrain extends SubsystemBase {
         return gyro.getRate() * (DrivetrainConstants.kGyroReversed ? -1.0 : 1.0);
     }
 
-    public void addVisionMeasurement(Pose2d pose, double timestamp){
-        m_estimator.addVisionMeasurement(pose, timestamp);
-    }
-
-    public double driveDistance(){
-        return m_frontLeft.getTotalDist();
-    }
-
     public double getVelocity(){
         return m_frontLeft.getState().speedMetersPerSecond;
     }
+
+    public Command resetToVision(){
+        return runOnce(() -> {
+            if(vision.getOrangeTagDetected()){
+                m_estimator.resetPose(new Pose2d(orangePose2d.getTranslation(), m_estimator.getEstimatedPosition().getRotation()));
+            }else if(vision.getBlackTagDetected()){
+                m_estimator.resetPose(new Pose2d(blackPose2d.getTranslation(), m_estimator.getEstimatedPosition().getRotation()));
+            }
+        });
+    }
 }

src/main/java/frc/robot/subsystems/Elevator.java

@@ -174,6 +174,14 @@ public class Elevator extends SubsystemBase {
         
     }
 
+    public Command homeCommand(){
+        return run(() -> {
+            elevatorMotor1.setVoltage(0.5);
+        })
+        .until(() -> elevatorMotor1.getOutputCurrent() > 5)
+        .andThen(run(() -> encoder.setPosition(0)));
+    }
+
     /**
      * Moves the elevator to a target destination (setpoint). 
      * 
@@ -208,7 +216,7 @@ public class Elevator extends SubsystemBase {
                     }
                 
                 }).until(() -> pidControllerUp.atSetpoint() || pidControllerDown.atSetpoint())
-                    .andThen(runManualElevator(() -> -.1)
+                    .andThen(runManualElevator(() -> -.5)
                     .until(() -> encoder.getPosition() == 0));
 
         } else {

src/main/java/frc/robot/subsystems/MAXSwerveModule.java

@@ -144,7 +144,4 @@ public class MAXSwerveModule {
         m_drive.setPosition(0);
     }
 
-    public double getTotalDist(){
-        return m_drive.getPosition().getValueAsDouble() * ModuleConstants.kWheelCircumferenceMeters;
-    }
 }

src/main/java/frc/robot/subsystems/Manipulator.java

@@ -10,11 +10,14 @@ import com.revrobotics.spark.SparkLowLevel.MotorType;
 import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj2.command.Command;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;
+import frc.robot.constants.IndexerConstants;
 import frc.robot.constants.ManipulatorConstants;
 
 public class Manipulator extends SubsystemBase {
     private SparkMax manipulatorMotor;
 
+    private SparkMax indexerMotor;
+
     private DigitalInput coralBeamBreak;
 
     public Manipulator() {
@@ -29,6 +32,17 @@ public class Manipulator extends SubsystemBase {
             PersistMode.kPersistParameters
         );
 
+        indexerMotor = new SparkMax(
+            IndexerConstants.kIndexerMotorID,
+            MotorType.kBrushless
+        );
+
+        indexerMotor.configure(
+            IndexerConstants.motorConfig,
+            ResetMode.kResetSafeParameters, 
+            PersistMode.kPersistParameters
+        );
+
         coralBeamBreak = new DigitalInput(ManipulatorConstants.kCoralBeamBreakID);
     }
 
@@ -56,6 +70,8 @@ public class Manipulator extends SubsystemBase {
             manipulatorMotor.set(
                 coral ? speed.getAsDouble() : speed.getAsDouble() * -1
             );
+
+            indexerMotor.set(0);
         });
     }
 
@@ -71,12 +87,30 @@ public class Manipulator extends SubsystemBase {
             manipulatorMotor.set(
                 speed.getAsDouble()
             );
-        }).until(() -> !coralBeamBreak.get());
+
+            indexerMotor.set(1);
+
+        }).unless(() -> !coralBeamBreak.get())
+        .until(() -> !coralBeamBreak.get());
+        /*
+        return run(() -> {
+            if(getCoralBeamBreak()) {
+                manipulatorMotor.set(
+                    speed.getAsDouble()
+                );
+            } else {
+                manipulatorMotor.set(
+                    speed.getAsDouble()
+                );
+            }
+        */
     }
 
     public Command retractCommand(DoubleSupplier retractSpeed){
         return run(() -> {
             manipulatorMotor.set(-retractSpeed.getAsDouble());
+
+            indexerMotor.set(0);
         }
         ).until(() -> coralBeamBreak.get());
     }

src/main/java/frc/robot/subsystems/ManipulatorPivot.java

@@ -9,7 +9,6 @@ import com.revrobotics.spark.SparkBase.PersistMode;
 import com.revrobotics.spark.SparkBase.ResetMode;
 import com.revrobotics.spark.SparkLowLevel.MotorType;
 
-import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.math.controller.ArmFeedforward;
 import edu.wpi.first.math.controller.PIDController;
 import edu.wpi.first.math.util.Units;
@@ -47,7 +46,7 @@ public class ManipulatorPivot extends SubsystemBase {
         );
         pidController.setSetpoint(0);
 
-        pidController.enableContinuousInput(0, 180);
+        pidController.enableContinuousInput(0, 280);
         
         feedForward = new ArmFeedforward(
             ManipulatorPivotConstants.kFeedForwardS,

src/main/java/frc/robot/subsystems/Vision.java

@@ -1,93 +1,125 @@
 package frc.robot.subsystems;
 
-import java.util.function.DoubleSupplier;
-
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.geometry.Transform2d;
 import edu.wpi.first.math.geometry.Translation2d;
+import edu.wpi.first.math.interpolation.TimeInterpolatableBuffer;
+import edu.wpi.first.math.util.Units;
 import edu.wpi.first.networktables.BooleanSubscriber;
 import edu.wpi.first.networktables.DoubleSubscriber;
 import edu.wpi.first.networktables.NetworkTable;
 import edu.wpi.first.networktables.NetworkTableInstance;
+import edu.wpi.first.wpilibj.Timer;
 import frc.robot.constants.VisionConstants;
 
 public class Vision{
 
-    private DoubleSubscriber blackRobotRelativeX;
-    private DoubleSubscriber blackRobotRelativeY;
-    private DoubleSubscriber blackRobotRelativeZ;
+    private NetworkTable blackVisionTable;
+
+    private DoubleSubscriber black_tx;
+    private DoubleSubscriber black_ty;
+    private DoubleSubscriber black_dist;
 
     private DoubleSubscriber blackClosestTag;
     private BooleanSubscriber blackTagDetected;
 
     private DoubleSubscriber blackFramerate;
 
-    private DoubleSubscriber orangeRobotRelativeX;
-    private DoubleSubscriber orangeRobotRelativeY;
-    private DoubleSubscriber orangeRobotRelativeZ;
+    private NetworkTable orangeVisionTable;
+
+    private DoubleSubscriber orange_tx;
+    private DoubleSubscriber orange_ty;
+    private DoubleSubscriber orange_dist;
 
     private DoubleSubscriber orangeClosestTag;
     private BooleanSubscriber orangeTagDetected;
 
     private DoubleSubscriber orangeFramerate;
 
-    private DoubleSupplier gyroAngle;
+    private double[] orangeCamPose = {0.0, Units.degreesToRadians(-5.0), Units.degreesToRadians(-10), 14.0-7.673, 14.0-1.05, 7.308+2.75};
+    private double[] blackCamPose = {0.0, Units.degreesToRadians(-5.0), Units.degreesToRadians(10), 14.0-7.673, 1.05-14.0, 7.308+2.75};
 
-    public Vision(DoubleSupplier gyroAngle){
+    public Vision(){
         NetworkTableInstance inst = NetworkTableInstance.getDefault();
 
-        NetworkTable blackVisionTable = inst.getTable("black_Fiducial");
-        NetworkTable orangeVisionTable = inst.getTable("orange_Fiducial");
+        blackVisionTable = inst.getTable("black_Fiducial");
+        orangeVisionTable = inst.getTable("orange_Fiducial");
 
-        blackRobotRelativeX = blackVisionTable.getDoubleTopic("blackRelativeX").subscribe(0.0);
-        blackRobotRelativeY = blackVisionTable.getDoubleTopic("blackRelativeY").subscribe(0.0);
-        blackRobotRelativeZ = blackVisionTable.getDoubleTopic("blackRelativeZ").subscribe(0.0);
+        black_tx = blackVisionTable.getDoubleTopic("tx").subscribe(0.0);
+        black_ty = blackVisionTable.getDoubleTopic("ty").subscribe(0.0);
+        black_dist = blackVisionTable.getDoubleTopic("totalDist").subscribe(0.0);
 
         blackClosestTag = blackVisionTable.getDoubleTopic("blackClosestTag").subscribe(0.0);
         blackTagDetected = blackVisionTable.getBooleanTopic("blackTagDetected").subscribe(false);
 
         blackFramerate = blackVisionTable.getDoubleTopic("blackFPS").subscribe(0.0);
 
-        orangeRobotRelativeX = orangeVisionTable.getDoubleTopic("orangeRelativeX").subscribe(0.0);
-        orangeRobotRelativeY = orangeVisionTable.getDoubleTopic("orangeRelativeY").subscribe(0.0);
-        orangeRobotRelativeZ = orangeVisionTable.getDoubleTopic("orangeRelativeZ").subscribe(0.0);
+        orange_tx = orangeVisionTable.getDoubleTopic("tx").subscribe(0.0);
+        orange_ty = orangeVisionTable.getDoubleTopic("ty").subscribe(0.0);
+        orange_dist = orangeVisionTable.getDoubleTopic("totalDist").subscribe(0.0);
 
         orangeClosestTag = orangeVisionTable.getDoubleTopic("orangeClosestTag").subscribe(0.0);
         orangeTagDetected = orangeVisionTable.getBooleanTopic("orangeTagDetected").subscribe(false);
 
         orangeFramerate = orangeVisionTable.getDoubleTopic("orangeFPS").subscribe(0.0);
+    
     }
     
-    public Pose2d relativeToGlobalPose2d(int tagID, Translation2d relativeCoords){
+    public Pose2d relativeToGlobalPose2d(int tagID, Translation2d relativeCoords, double timestamp, TimeInterpolatableBuffer<Double> gyroBuffer){
         Pose2d tag2dPose = new Pose2d(VisionConstants.globalTagCoords[tagID][0],
             VisionConstants.globalTagCoords[tagID][1],
             new Rotation2d());
 
-        Pose2d relative = new Pose2d(relativeCoords, new Rotation2d(gyroAngle.getAsDouble()));
+        Pose2d relative = new Pose2d(relativeCoords, new Rotation2d(gyroBuffer.getSample(timestamp).get()));
 
         Transform2d relative2dTransformation = new Transform2d(relative.getTranslation(), relative.getRotation());
 
         Pose2d globalPose = tag2dPose.transformBy(relative2dTransformation.inverse());
 
-        return new Pose2d(globalPose.getTranslation(), new Rotation2d(gyroAngle.getAsDouble()));
+        return new Pose2d(globalPose.getTranslation(), new Rotation2d(gyroBuffer.getSample(timestamp).get()));
     }
 
-    public Pose2d getBlackGlobalPose(){
-        return relativeToGlobalPose2d(getBlackClosestTag(), 
-            new Translation2d(getBlackRelativeX(), getBlackRelativeY()));
+    public Pose2d cameraToGlobalPose2d(int tagID, double totalDist, double tx, double ty, double timestamp, TimeInterpolatableBuffer<Double> gyroBuffer, double[] camPose){
+
+       // System.out.println(gyroBuffer.getSample(timestamp));
+
+        double distance2d = Units.inchesToMeters(totalDist) * Math.cos(-camPose[1] + Units.degreesToRadians(ty));
+
+        Rotation2d camToTagRotation = new Rotation2d(Units.degreesToRadians(gyroBuffer.getSample(timestamp).get()+Units.degreesToRadians(180))).plus(Rotation2d.fromRadians(camPose[2]).plus(Rotation2d.fromRadians(Units.degreesToRadians(-tx))));
+
+        Pose2d tagPose2d = new Pose2d(Units.inchesToMeters(VisionConstants.globalTagCoords[tagID][0]),
+        Units.inchesToMeters(VisionConstants.globalTagCoords[tagID][1]),
+            new Rotation2d());
+
+        Translation2d fieldToCameraTranslation = new Pose2d(tagPose2d.getTranslation(), camToTagRotation.plus(Rotation2d.kPi))
+            .transformBy(new Transform2d(distance2d, 0.0, new Rotation2d()))
+            .getTranslation();
+        Pose2d robotPose = new Pose2d(
+            fieldToCameraTranslation,
+            new Rotation2d(Units.degreesToRadians(gyroBuffer.getSample(timestamp).get()+Units.degreesToRadians(180))).plus(new Rotation2d(camPose[2])))
+            .transformBy(new Transform2d(new Pose2d(new Translation2d(Units.inchesToMeters(camPose[3]), Units.inchesToMeters(camPose[4])), new Rotation2d(camPose[2])), Pose2d.kZero));
+
+        robotPose = new Pose2d(robotPose.getTranslation(), new Rotation2d(Units.degreesToRadians(gyroBuffer.getSample(timestamp).get()+Units.degreesToRadians(180))));
+
+        return robotPose;
     }
 
-    public double getBlackRelativeX(){
-        return blackRobotRelativeX.get();
+    public Pose2d getBlackGlobalPose(TimeInterpolatableBuffer<Double> gyroBuffer){
+        return cameraToGlobalPose2d(getBlackClosestTag(), black_dist.get(),
+            getBlackTX(), getBlackTY(), getBlackTimeStamp(), gyroBuffer, blackCamPose);
     }
 
-    public double getBlackRelativeY(){
-        return blackRobotRelativeY.get();
+    public double getBlackTX(){
+        return black_tx.get();
     }
 
-    public double getBlackRelativeZ(){
-        return blackRobotRelativeZ.get();
+    public double getBlackTY(){
+        return black_ty.get();
+    }
+
+    public double getBlackDist(){
+        return black_dist.get();
     }
 
     public int getBlackClosestTag(){
@@ -95,7 +127,7 @@ public class Vision{
     }
 
     public double getBlackTimeStamp(){
-        return blackRobotRelativeX.getLastChange();
+        return black_tx.getLastChange()-VisionConstants.latencyFudge;
     }
 
     public boolean getBlackTagDetected(){
@@ -106,21 +138,26 @@ public class Vision{
         return blackFramerate.get();
     }
 
-    public Pose2d getOrangeGlobalPose(){
-        return relativeToGlobalPose2d(getOrangeClosestTag(), 
-            new Translation2d(getOrangeRelativeX(), getOrangeRelativeY()));
+    public Pose2d getOrangeGlobalPose(TimeInterpolatableBuffer<Double> gyroBuffer){
+        if(getOrangeClosestTag() >= 1 && getOrangeClosestTag() <= 22){
+            return cameraToGlobalPose2d(getOrangeClosestTag(), orange_dist.get(),
+                orange_tx.get(), orange_ty.get(), getOrangeTimeStamp(), gyroBuffer, orangeCamPose
+                );
+        }else{
+            return new Pose2d();
+        }
     }
     
-    public double getOrangeRelativeX(){
-        return orangeRobotRelativeX.get();
+    public double getOrangeTX(){
+        return orange_tx.get();
     }
 
-    public double getOrangeRelativeY(){
-        return orangeRobotRelativeY.get();
+    public double getOrangeTY(){
+        return orange_ty.get();
     }
 
-    public double getOrangeRelativeZ(){
-        return orangeRobotRelativeZ.get();
+    public double getOrangeDist(){
+        return orange_dist.get();
     }
 
     public int getOrangeClosestTag(){
@@ -128,7 +165,7 @@ public class Vision{
     }
 
     public double getOrangeTimeStamp(){
-        return orangeRobotRelativeX.getLastChange();
+        return orange_tx.getLastChange()-VisionConstants.latencyFudge;
     }
 
     public boolean getOrangeTagDetected(){
@@ -138,5 +175,13 @@ public class Vision{
     public double getOrangeFPS(){
         return orangeFramerate.get();
     }
+
+    public boolean isBlackConnected(){
+        return Timer.getFPGATimestamp()-black_tx.getLastChange() > 2.0;
+    }
+
+    public boolean isOrangeConnected(){
+        return Timer.getFPGATimestamp()-orange_tx.getLastChange() > 2.0;
+    }
     
 }