[Robot] Make autos stop to shoot

SouthwestRoboticsProgramming · Mar 23, 2024 · de07545 · de07545
1 parent 158360a
commit de07545
Show file tree

Hide file tree

Showing 22 changed files with 18,753 additions and 18,857 deletions.
diff --git a/Robot/Chreo_Auto_Project.chor b/Robot/Chreo_Auto_Project.chor
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid A.1.traj b/Robot/src/main/deploy/choreo/Amp Side Mid A.1.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid A.2.traj b/Robot/src/main/deploy/choreo/Amp Side Mid A.2.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid A.3.traj b/Robot/src/main/deploy/choreo/Amp Side Mid A.3.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid A.4.traj b/Robot/src/main/deploy/choreo/Amp Side Mid A.4.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid A.traj b/Robot/src/main/deploy/choreo/Amp Side Mid A.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid B.1.traj b/Robot/src/main/deploy/choreo/Amp Side Mid B.1.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid B.2.traj b/Robot/src/main/deploy/choreo/Amp Side Mid B.2.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid B.3.traj b/Robot/src/main/deploy/choreo/Amp Side Mid B.3.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid B.4.traj b/Robot/src/main/deploy/choreo/Amp Side Mid B.4.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Mid B.traj b/Robot/src/main/deploy/choreo/Amp Side Mid B.traj
diff --git a/Robot/src/main/deploy/choreo/Amp Side Start A.1.traj b/Robot/src/main/deploy/choreo/Amp Side Start A.1.traj
@@ -230,6 +230,15 @@
           "name": "Wait and Shoot"
         }
       }
+    },
+    {
+      "timestamp": 1.345777924459432,
+      "command": {
+        "type": "named",
+        "data": {
+          "name": "Shoot"
+        }
+      }
     }
   ]
 }
diff --git a/Robot/src/main/deploy/choreo/Amp Side Start A.traj b/Robot/src/main/deploy/choreo/Amp Side Start A.traj
@@ -230,6 +230,15 @@
           "name": "Wait and Shoot"
         }
       }
+    },
+    {
+      "timestamp": 1.345777924459432,
+      "command": {
+        "type": "named",
+        "data": {
+          "name": "Shoot"
+        }
+      }
     }
   ]
 }
diff --git a/Robot/src/main/deploy/choreo/Amp Side Start C.1.traj b/Robot/src/main/deploy/choreo/Amp Side Start C.1.traj
@@ -1,112 +1,148 @@
 {
   "samples": [
     {
-      "x": 1.373390793800354,
-      "y": 4.741092681884766,
-      "heading": 2.6399884969262475,
-      "angularVelocity": -3.6988129489772723e-28,
-      "velocityX": -6.858958396136724e-27,
-      "velocityY": -1.5418289496585915e-26,
+      "x": 1.2314672470092771,
+      "y": 4.670130729675293,
+      "heading": 2.414268531922355,
+      "angularVelocity": -5.2100101100154926e-30,
+      "velocityX": 5.347254929636904e-27,
+      "velocityY": 9.19140137657714e-27,
       "timestamp": 0
     },
     {
-      "x": 1.411237442090302,
-      "y": 4.725482025332623,
-      "heading": 2.644755988404159,
-      "angularVelocity": 0.0553306640200131,
-      "velocityX": 0.43924151527419975,
-      "velocityY": -0.18117452266465503,
-      "timestamp": 0.08616364112650379
+      "x": 1.25427772593092,
+      "y": 4.663040954972958,
+      "heading": 2.4209562198461265,
+      "angularVelocity": 0.07860545105698431,
+      "velocityX": 0.26810880006649607,
+      "velocityY": -0.08333148088273383,
+      "timestamp": 0.08507918768792878
     },
     {
-      "x": 1.4869306891456044,
-      "y": 4.694260596197965,
-      "heading": 2.654289693354832,
-      "angularVelocity": 0.11064649573798489,
-      "velocityX": 0.878482455774716,
-      "velocityY": -0.3623503919573132,
-      "timestamp": 0.17232728225300759
+      "x": 1.299898487748357,
+      "y": 4.648861096431842,
+      "heading": 2.4343273732150403,
+      "angularVelocity": 0.1571612721310791,
+      "velocityX": 0.5362152960930298,
+      "velocityY": -0.1666665952797718,
+      "timestamp": 0.17015837537585757
     },
     {
-      "x": 1.6004704665028786,
-      "y": 4.647428216491871,
-      "heading": 2.668587209347816,
-      "angularVelocity": 0.16593444527248416,
-      "velocityX": 1.3177226017013057,
-      "velocityY": -0.5435283269579504,
-      "timestamp": 0.2584909233795114
+      "x": 1.3683293697300698,
+      "y": 4.6275906046406945,
+      "heading": 2.454369493563087,
+      "angularVelocity": 0.23557018928720364,
+      "velocityX": 0.8043198794130212,
+      "velocityY": -0.2500081673225167,
+      "timestamp": 0.25523756306378637
     },
     {
-      "x": 1.7518566827715065,
-      "y": 4.58498464715587,
-      "heading": 2.6876455596924695,
-      "angularVelocity": 0.22118784786116857,
-      "velocityX": 1.7569616869645228,
-      "velocityY": -0.7247090364289812,
-      "timestamp": 0.34465456450601517
+      "x": 1.4595702265370212,
+      "y": 4.599228679736338,
+      "heading": 2.481062894448308,
+      "angularVelocity": 0.3137477168109834,
+      "velocityX": 1.0724227544534584,
+      "velocityY": -0.33335914076175294,
+      "timestamp": 0.34031675075171514
     },
     {
-      "x": 1.941089213909603,
-      "y": 4.5069295915038685,
-      "heading": 2.7114619454581304,
-      "angularVelocity": 0.2764087665549548,
-      "velocityX": 2.1961993326195337,
-      "velocityY": -0.9058931891864103,
-      "timestamp": 0.43081820563251894
+      "x": 1.5736209091482751,
+      "y": 4.5637742614596535,
+      "heading": 2.5143822102441398,
+      "angularVelocity": 0.39162710295315967,
+      "velocityX": 1.340523877938196,
+      "velocityY": -0.41672257622782727,
+      "timestamp": 0.4253959384396439
     },
     {
-      "x": 2.1303192711002823,
-      "y": 4.428868248917787,
-      "heading": 2.7352473347586073,
-      "angularVelocity": 0.2760490270548816,
-      "velocityX": 2.196170620422779,
-      "velocityY": -0.9059661542328877,
-      "timestamp": 0.5169818467590227
+      "x": 1.7104812390640793,
+      "y": 4.521226021274406,
+      "heading": 2.5542983242065618,
+      "angularVelocity": 0.469164257994969,
+      "velocityX": 1.6086229033804282,
+      "velocityY": -0.5001016269844418,
+      "timestamp": 0.5104751261275727
     },
     {
-      "x": 2.2817032282796483,
-      "y": 4.366418932119097,
-      "heading": 2.754276421488494,
-      "angularVelocity": 0.22084821951695574,
-      "velocityX": 1.7569354683735667,
-      "velocityY": -0.7247757404657851,
-      "timestamp": 0.6031454878855265
+      "x": 1.8701509755218075,
+      "y": 4.471582359349749,
+      "heading": 2.600780705433162,
+      "angularVelocity": 0.5463425602639517,
+      "velocityX": 1.8767190989575278,
+      "velocityY": -0.5834994817622204,
+      "timestamp": 0.5955543138155015
     },
     {
-      "x": 2.3952411491674033,
-      "y": 4.319581824357118,
-      "heading": 2.7685487866211282,
-      "angularVelocity": 0.16564254882961663,
-      "velocityX": 1.317701055843969,
-      "velocityY": -0.5435831999394507,
-      "timestamp": 0.6893091290120302
+      "x": 2.0298090975993626,
+      "y": 4.421877004084367,
+      "heading": 2.646315216105001,
+      "angularVelocity": 0.5352015211858865,
+      "velocityX": 1.876582586368622,
+      "velocityY": -0.5842246102266782,
+      "timestamp": 0.6806335015034303
     },
     {
-      "x": 2.470933081482251,
-      "y": 4.288357045534494,
-      "heading": 2.778063858835731,
-      "angularVelocity": 0.1104302474942169,
-      "velocityX": 0.8784671971292191,
-      "velocityY": -0.3623892678442039,
-      "timestamp": 0.775472770138534
+      "x": 2.1666583517760736,
+      "y": 4.379270074305973,
+      "heading": 2.685326672139293,
+      "angularVelocity": 0.45853112957996595,
+      "velocityX": 1.6084927218472653,
+      "velocityY": -0.5007914501332125,
+      "timestamp": 0.765712689191359
+    },
+    {
+      "x": 2.2806989716360007,
+      "y": 4.343762747699759,
+      "heading": 2.717827419605436,
+      "angularVelocity": 0.38200585065945625,
+      "velocityX": 1.3404056028159197,
+      "velocityY": -0.4173444478155432,
+      "timestamp": 0.8507918768792878
+    },
+    {
+      "x": 2.3719311822566893,
+      "y": 4.315355961950949,
+      "heading": 2.7438246843650607,
+      "angularVelocity": 0.3055655027523666,
+      "velocityX": 1.0723211292910941,
+      "velocityY": -0.3338864241746834,
+      "timestamp": 0.9358710645672166
+    },
+    {
+      "x": 2.440355176758643,
+      "y": 4.29405041622838,
+      "heading": 2.763322145123904,
+      "angularVelocity": 0.22916839345434334,
+      "velocityX": 0.8042389256575113,
+      "velocityY": -0.2504201826740351,
+      "timestamp": 1.0209502522551455
+    },
+    {
+      "x": 2.4859711018991932,
+      "y": 4.279846572314698,
+      "heading": 2.776321113344305,
+      "angularVelocity": 0.1527866987644639,
+      "velocityX": 0.536158446973772,
+      "velocityY": -0.1669485134928884,
+      "timestamp": 1.1060294399430743
     },
     {
       "x": 2.5087790489196777,
       "y": 4.272744655609131,
       "heading": 2.7828213217115327,
-      "angularVelocity": 0.05521427383525686,
-      "velocityX": 0.4392336134200937,
-      "velocityY": -0.18119463988808376,
-      "timestamp": 0.8616364112650378
+      "angularVelocity": 0.07640186212250696,
+      "velocityX": 0.26807904071844774,
+      "velocityY": -0.08347419502425253,
+      "timestamp": 1.1911086276310032
     },
     {
       "x": 2.5087790489196777,
       "y": 4.272744655609131,
       "heading": 2.7828213217115327,
-      "angularVelocity": -2.766219324607853e-28,
-      "velocityX": -9.297420403564632e-27,
-      "velocityY": -2.6804687000261814e-26,
-      "timestamp": 0.9478000523915415
+      "angularVelocity": 1.3083302481141851e-23,
+      "velocityX": 3.175111039019461e-23,
+      "velocityY": -1.059107290269951e-22,
+      "timestamp": 1.276187815318932
     }
   ],
   "eventMarkers": [