Skip to content
Merged
58 changes: 29 additions & 29 deletions src/main/deploy/choreo/DSideAllianceToDepot.traj

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions src/main/deploy/choreo/DSideCornerToDSideTrench.traj

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions src/main/deploy/choreo/DSideTrenchToNeutral.traj
Original file line number Diff line number Diff line change
Expand Up @@ -69,28 +69,28 @@
{"t":0.38986, "x":4.81216, "y":7.65824, "heading":1.5708, "vx":3.5134, "vy":-0.00029, "omega":0.0, "ax":8.99183, "ay":-0.00177, "alpha":0.0, "fx":[152.94838,152.94838,152.94838,152.94838], "fy":[-0.0301,-0.0301,-0.0301,-0.0301]},
{"t":0.43318, "x":4.97278, "y":7.65823, "heading":1.5708, "vx":3.90291, "vy":-0.00037, "omega":0.0, "ax":8.97441, "ay":-0.00222, "alpha":0.0, "fx":[152.65216,152.65216,152.65216,152.65216], "fy":[-0.0377,-0.0377,-0.0377,-0.0377]},
{"t":0.47649, "x":5.15027, "y":7.65821, "heading":1.5708, "vx":4.29166, "vy":-0.00046, "omega":0.0, "ax":8.92275, "ay":-0.00298, "alpha":0.0, "fx":[151.77349,151.77349,151.77349,151.77349], "fy":[-0.05068,-0.05068,-0.05068,-0.05068]},
{"t":0.51981, "x":5.34454, "y":7.65819, "heading":1.5708, "vx":4.67817, "vy":-0.00059, "omega":0.0, "ax":5.25761, "ay":-0.02449, "alpha":0.0, "fx":[89.43045,89.43045,89.43045,89.43045], "fy":[-0.41656,-0.41656,-0.41656,-0.41656]},
{"t":0.56313, "x":5.55212, "y":7.65814, "heading":1.5708, "vx":4.90592, "vy":-0.00165, "omega":0.0, "ax":0.00218, "ay":-0.02563, "alpha":0.0, "fx":[0.037,0.037,0.037,0.037], "fy":[-0.43602,-0.43602,-0.43602,-0.43602]},
{"t":0.60645, "x":5.76464, "y":7.65804, "heading":1.5708, "vx":4.90601, "vy":-0.00276, "omega":0.0, "ax":-0.00002, "ay":-0.03157, "alpha":0.0, "fx":[-0.00037,-0.00037,-0.00037,-0.00037], "fy":[-0.537,-0.537,-0.537,-0.537]},
{"t":0.64976, "x":5.97716, "y":7.65789, "heading":1.5708, "vx":4.90601, "vy":-0.00413, "omega":0.0, "ax":-0.00002, "ay":-0.02569, "alpha":0.0, "fx":[-0.00042,-0.00042,-0.00042,-0.00042], "fy":[-0.43694,-0.43694,-0.43694,-0.43694]},
{"t":0.69308, "x":6.18967, "y":7.65769, "heading":1.5708, "vx":4.90601, "vy":-0.00524, "omega":0.0, "ax":-0.00002, "ay":0.07987, "alpha":0.0, "fx":[-0.00028,-0.00028,-0.00028,-0.00028], "fy":[1.35863,1.35863,1.35863,1.35863]},
{"t":0.7364, "x":6.40219, "y":7.65754, "heading":1.5708, "vx":4.90601, "vy":-0.00178, "omega":0.0, "ax":-0.27137, "ay":0.71107, "alpha":0.0, "fx":[-4.61589,-4.61589,-4.61589,-4.61589], "fy":[12.09505,12.09505,12.09505,12.09505]},
{"t":0.77972, "x":6.61445, "y":7.65813, "heading":1.5708, "vx":4.89425, "vy":0.02902, "omega":0.0, "ax":-8.88234, "ay":0.0732, "alpha":0.0, "fx":[-151.08612,-151.08612,-151.08612,-151.08612], "fy":[1.24513,1.24513,1.24513,1.24513]},
{"t":0.82304, "x":6.81813, "y":7.65945, "heading":1.5708, "vx":4.50949, "vy":0.03219, "omega":0.0, "ax":-8.96564, "ay":0.0417, "alpha":0.0, "fx":[-152.5029,-152.5029,-152.5029,-152.5029], "fy":[0.7093,0.7093,0.7093,0.7093]},
{"t":0.86635, "x":7.00506, "y":7.66089, "heading":1.5708, "vx":4.12112, "vy":0.034, "omega":0.0, "ax":-8.9881, "ay":0.0265, "alpha":0.0, "fx":[-152.88505,-152.88505,-152.88505,-152.88505], "fy":[0.45068,0.45068,0.45068,0.45068]},
{"t":0.51981, "x":5.34454, "y":7.65819, "heading":1.5708, "vx":4.67817, "vy":-0.00059, "omega":0.0, "ax":5.25761, "ay":-0.02449, "alpha":0.0, "fx":[89.43045,89.43045,89.43045,89.43045], "fy":[-0.41655,-0.41655,-0.41655,-0.41655]},
{"t":0.56313, "x":5.55212, "y":7.65814, "heading":1.5708, "vx":4.90592, "vy":-0.00165, "omega":0.0, "ax":0.00218, "ay":-0.02563, "alpha":0.0, "fx":[0.037,0.037,0.037,0.037], "fy":[-0.43603,-0.43603,-0.43603,-0.43603]},
{"t":0.60645, "x":5.76464, "y":7.65804, "heading":1.5708, "vx":4.90601, "vy":-0.00276, "omega":0.0, "ax":-0.00002, "ay":-0.03157, "alpha":0.0, "fx":[-0.00037,-0.00037,-0.00037,-0.00037], "fy":[-0.53694,-0.53694,-0.53694,-0.53694]},
{"t":0.64976, "x":5.97716, "y":7.65789, "heading":1.5708, "vx":4.90601, "vy":-0.00413, "omega":0.0, "ax":-0.00002, "ay":-0.02568, "alpha":0.0, "fx":[-0.00042,-0.00042,-0.00042,-0.00042], "fy":[-0.43679,-0.43679,-0.43679,-0.43679]},
{"t":0.69308, "x":6.18967, "y":7.65769, "heading":1.5708, "vx":4.90601, "vy":-0.00524, "omega":0.0, "ax":-0.00002, "ay":0.07984, "alpha":0.0, "fx":[-0.00028,-0.00028,-0.00028,-0.00028], "fy":[1.35799,1.35799,1.35799,1.35799]},
{"t":0.7364, "x":6.40219, "y":7.65754, "heading":1.5708, "vx":4.90601, "vy":-0.00178, "omega":0.0, "ax":-0.27137, "ay":0.7111, "alpha":0.0, "fx":[-4.61589,-4.61589,-4.61589,-4.61589], "fy":[12.09556,12.09556,12.09556,12.09556]},
{"t":0.77972, "x":6.61445, "y":7.65813, "heading":1.5708, "vx":4.89425, "vy":0.02902, "omega":0.0, "ax":-8.88234, "ay":0.0732, "alpha":0.0, "fx":[-151.08612,-151.08612,-151.08612,-151.08612], "fy":[1.24509,1.24509,1.24509,1.24509]},
{"t":0.82304, "x":6.81813, "y":7.65945, "heading":1.5708, "vx":4.50949, "vy":0.03219, "omega":0.0, "ax":-8.96564, "ay":0.0417, "alpha":0.0, "fx":[-152.5029,-152.5029,-152.5029,-152.5029], "fy":[0.70929,0.70929,0.70929,0.70929]},
{"t":0.86635, "x":7.00506, "y":7.66089, "heading":1.5708, "vx":4.12112, "vy":0.034, "omega":0.0, "ax":-8.9881, "ay":0.02649, "alpha":0.0, "fx":[-152.88505,-152.88505,-152.88505,-152.88505], "fy":[0.45067,0.45067,0.45067,0.45067]},
{"t":0.90967, "x":7.17514, "y":7.66238, "heading":1.5708, "vx":3.73178, "vy":0.03514, "omega":0.0, "ax":-8.99853, "ay":0.01016, "alpha":0.0, "fx":[-153.06239,-153.06239,-153.06239,-153.06239], "fy":[0.1729,0.1729,0.1729,0.1729]},
{"t":0.95299, "x":7.32835, "y":7.66392, "heading":1.5708, "vx":3.34198, "vy":0.03559, "omega":0.0, "ax":-9.00452, "ay":-0.01169, "alpha":0.0, "fx":[-153.16431,-153.16431,-153.16431,-153.16431], "fy":[-0.19888,-0.19888,-0.19888,-0.19888]},
{"t":0.99631, "x":7.46467, "y":7.66545, "heading":1.5708, "vx":2.95193, "vy":0.03508, "omega":0.0, "ax":-9.00832, "ay":-0.04378, "alpha":0.0, "fx":[-153.22895,-153.22895,-153.22895,-153.22895], "fy":[-0.74465,-0.74465,-0.74465,-0.74465]},
{"t":1.03962, "x":7.58409, "y":7.66693, "heading":1.5708, "vx":2.56171, "vy":0.03318, "omega":0.0, "ax":-9.01063, "ay":-0.09867, "alpha":0.0, "fx":[-153.26815,-153.26815,-153.26815,-153.26815], "fy":[-1.67835,-1.67835,-1.67835,-1.67835]},
{"t":1.08294, "x":7.6866, "y":7.66827, "heading":1.5708, "vx":2.17139, "vy":0.02891, "omega":0.0, "ax":-8.63208, "ay":-2.59524, "alpha":0.0, "fx":[-146.82914,-146.82914,-146.82914,-146.82914], "fy":[-44.14437,-44.14437,-44.14437,-44.14437]},
{"t":1.12626, "x":7.77256, "y":7.66709, "heading":1.5708, "vx":1.79747, "vy":-0.08351, "omega":0.0, "ax":-7.12233, "ay":-5.53027, "alpha":0.0, "fx":[-121.14875,-121.14875,-121.14875,-121.14875], "fy":[-94.06832,-94.06832,-94.06832,-94.06832]},
{"t":1.16958, "x":7.84374, "y":7.65828, "heading":1.5708, "vx":1.48895, "vy":-0.32307, "omega":0.0, "ax":-3.56573, "ay":-8.2816, "alpha":0.0, "fx":[-60.65205,-60.65205,-60.65205,-60.65205], "fy":[-140.86759,-140.86759,-140.86759,-140.86759]},
{"t":1.16958, "x":7.84374, "y":7.65828, "heading":1.5708, "vx":1.48895, "vy":-0.32307, "omega":0.0, "ax":-3.56573, "ay":-8.2816, "alpha":0.0, "fx":[-60.65206,-60.65206,-60.65206,-60.65206], "fy":[-140.86759,-140.86759,-140.86759,-140.86759]},
{"t":1.21859, "x":7.91243, "y":7.6325, "heading":1.5708, "vx":1.3142, "vy":-0.72894, "omega":0.0, "ax":-5.14763, "ay":-7.39561, "alpha":0.0, "fx":[-87.55972,-87.55972,-87.55972,-87.55972], "fy":[-125.79729,-125.79729,-125.79729,-125.79729]},
{"t":1.26759, "x":7.97066, "y":7.5879, "heading":1.5708, "vx":1.06191, "vy":-1.0914, "omega":0.0, "ax":-7.27791, "ay":-5.28694, "alpha":0.0, "fx":[-123.79512,-123.79512,-123.79512,-123.79512], "fy":[-89.92939,-89.92939,-89.92939,-89.92939]},
{"t":1.3166, "x":8.01396, "y":7.52806, "heading":1.5708, "vx":0.70523, "vy":-1.3505, "omega":0.0, "ax":-8.43313, "ay":-2.95725, "alpha":0.0, "fx":[-143.44511,-143.44511,-143.44511,-143.44511], "fy":[-50.302,-50.302,-50.302,-50.302]},
{"t":1.36561, "x":8.03839, "y":7.45832, "heading":1.5708, "vx":0.29193, "vy":-1.49544, "omega":0.0, "ax":-7.62933, "ay":-0.53147, "alpha":0.0, "fx":[-129.7727,-129.7727,-129.7727,-129.7727], "fy":[-9.04013,-9.04013,-9.04013,-9.04013]},
{"t":1.41462, "x":8.04354, "y":7.38439, "heading":1.5708, "vx":-0.08197, "vy":-1.52148, "omega":0.0, "ax":-0.50009, "ay":0.03097, "alpha":0.0, "fx":[-8.50642,-8.50642,-8.50642,-8.50642], "fy":[0.52685,0.52685,0.52685,0.52685]},
{"t":1.46363, "x":8.03892, "y":7.30986, "heading":1.5708, "vx":-0.10648, "vy":-1.51996, "omega":0.0, "ax":-0.00934, "ay":0.00066, "alpha":0.0, "fx":[-0.15888,-0.15888,-0.15888,-0.15888], "fy":[0.01115,0.01115,0.01115,0.01115]},
{"t":1.36561, "x":8.03839, "y":7.45832, "heading":1.5708, "vx":0.29193, "vy":-1.49544, "omega":0.0, "ax":-7.62933, "ay":-0.53147, "alpha":0.0, "fx":[-129.77269,-129.77269,-129.77269,-129.77269], "fy":[-9.04013,-9.04013,-9.04013,-9.04013]},
{"t":1.41462, "x":8.04354, "y":7.38439, "heading":1.5708, "vx":-0.08197, "vy":-1.52148, "omega":0.0, "ax":-0.50009, "ay":0.03097, "alpha":0.0, "fx":[-8.50645,-8.50645,-8.50645,-8.50645], "fy":[0.52685,0.52685,0.52685,0.52685]},
{"t":1.46363, "x":8.03892, "y":7.30986, "heading":1.5708, "vx":-0.10648, "vy":-1.51996, "omega":0.0, "ax":-0.00934, "ay":0.00066, "alpha":0.0, "fx":[-0.15886,-0.15886,-0.15886,-0.15886], "fy":[0.01115,0.01115,0.01115,0.01115]},
{"t":1.51264, "x":8.03369, "y":7.23537, "heading":1.5708, "vx":-0.10694, "vy":-1.51993, "omega":0.0, "ax":-0.00017, "ay":0.00001, "alpha":0.0, "fx":[-0.00296,-0.00296,-0.00296,-0.00296], "fy":[0.00021,0.00021,0.00021,0.00021]},
{"t":1.56165, "x":8.02845, "y":7.16088, "heading":1.5708, "vx":-0.10695, "vy":-1.51993, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[-0.00006,-0.00006,-0.00006,-0.00006], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.61066, "x":8.02321, "y":7.08639, "heading":1.5708, "vx":-0.10695, "vy":-1.51993, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[0.0,0.0,0.0,0.0], "fy":[0.0,0.0,0.0,0.0]},
Expand Down
18 changes: 9 additions & 9 deletions src/main/deploy/choreo/DepotToCorner.traj
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,22 @@
"waypoints":[0.0,0.8504],
"samples":[
{"t":0.0, "x":0.68343, "y":5.97907, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":-0.50627, "ay":9.00495, "alpha":0.0, "fx":[-8.61149,-8.61149,-8.61149,-8.61149], "fy":[153.17162,153.17162,153.17162,153.17162]},
{"t":0.05002, "x":0.68279, "y":5.99034, "heading":0.0, "vx":-0.02533, "vy":0.45046, "omega":0.0, "ax":-0.50621, "ay":9.00386, "alpha":0.0, "fx":[-8.61044,-8.61044,-8.61044,-8.61044], "fy":[153.1531,153.1531,153.1531,153.1531]},
{"t":0.05002, "x":0.68279, "y":5.99034, "heading":0.0, "vx":-0.02533, "vy":0.45046, "omega":0.0, "ax":-0.50621, "ay":9.00386, "alpha":0.0, "fx":[-8.61045,-8.61045,-8.61045,-8.61045], "fy":[153.1531,153.1531,153.1531,153.1531]},
{"t":0.10005, "x":0.68089, "y":6.02414, "heading":0.0, "vx":-0.05065, "vy":0.90087, "omega":0.0, "ax":-0.50613, "ay":9.00241, "alpha":0.0, "fx":[-8.60906,-8.60906,-8.60906,-8.60906], "fy":[153.12841,153.12841,153.12841,153.12841]},
{"t":0.15007, "x":0.67772, "y":6.08047, "heading":0.0, "vx":-0.07597, "vy":1.3512, "omega":0.0, "ax":-0.50601, "ay":9.00038, "alpha":0.0, "fx":[-8.60711,-8.60711,-8.60711,-8.60711], "fy":[153.09384,153.09384,153.09384,153.09384]},
{"t":0.2001, "x":0.67329, "y":6.15932, "heading":0.0, "vx":-0.10128, "vy":1.80144, "omega":0.0, "ax":-0.50584, "ay":8.99733, "alpha":0.0, "fx":[-8.6042,-8.6042,-8.6042,-8.6042], "fy":[153.042,153.042,153.042,153.042]},
{"t":0.25012, "x":0.66759, "y":6.26069, "heading":0.0, "vx":-0.12658, "vy":2.25152, "omega":0.0, "ax":-0.50556, "ay":8.99225, "alpha":0.0, "fx":[-8.59935,-8.59935,-8.59935,-8.59935], "fy":[152.95563,152.95563,152.95563,152.95563]},
{"t":0.30014, "x":0.66063, "y":6.38457, "heading":0.0, "vx":-0.15187, "vy":2.70134, "omega":0.0, "ax":-0.50499, "ay":8.9821, "alpha":0.0, "fx":[-8.58966,-8.58966,-8.58966,-8.58966], "fy":[152.78301,152.78301,152.78301,152.78301]},
{"t":0.35017, "x":0.6524, "y":6.53094, "heading":0.0, "vx":-0.17713, "vy":3.15066, "omega":0.0, "ax":-0.50328, "ay":8.95172, "alpha":0.0, "fx":[-8.56064,-8.56064,-8.56064,-8.56064], "fy":[152.26625,152.26625,152.26625,152.26625]},
{"t":0.40019, "x":0.64291, "y":6.69975, "heading":0.0, "vx":-0.20231, "vy":3.59846, "omega":0.0, "ax":0.00001, "ay":0.0, "alpha":0.0, "fx":[0.00013,0.00013,0.00013,0.00013], "fy":[0.00001,0.00001,0.00001,0.00001]},
{"t":0.45021, "x":0.63279, "y":6.87976, "heading":0.0, "vx":-0.20231, "vy":3.59846, "omega":0.0, "ax":0.50328, "ay":-8.95172, "alpha":0.0, "fx":[8.56057,8.56057,8.56057,8.56057], "fy":[-152.26625,-152.26625,-152.26625,-152.26625]},
{"t":0.50024, "x":0.6233, "y":7.04857, "heading":0.0, "vx":-0.17713, "vy":3.15066, "omega":0.0, "ax":0.50498, "ay":-8.9821, "alpha":0.0, "fx":[8.58962,8.58962,8.58962,8.58962], "fy":[-152.78302,-152.78302,-152.78302,-152.78302]},
{"t":0.25012, "x":0.66759, "y":6.26069, "heading":0.0, "vx":-0.12658, "vy":2.25152, "omega":0.0, "ax":-0.50555, "ay":8.99225, "alpha":0.0, "fx":[-8.59934,-8.59934,-8.59934,-8.59934], "fy":[152.95563,152.95563,152.95563,152.95563]},
{"t":0.30014, "x":0.66063, "y":6.38457, "heading":0.0, "vx":-0.15187, "vy":2.70134, "omega":0.0, "ax":-0.50498, "ay":8.9821, "alpha":0.0, "fx":[-8.58964,-8.58964,-8.58964,-8.58964], "fy":[152.78301,152.78301,152.78301,152.78301]},
{"t":0.35017, "x":0.6524, "y":6.53094, "heading":0.0, "vx":-0.17713, "vy":3.15066, "omega":0.0, "ax":-0.50328, "ay":8.95172, "alpha":0.0, "fx":[-8.56059,-8.56059,-8.56059,-8.56059], "fy":[152.26625,152.26625,152.26625,152.26625]},
{"t":0.40019, "x":0.64291, "y":6.69975, "heading":0.0, "vx":-0.20231, "vy":3.59846, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[0.0,0.0,0.0,0.0], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.45021, "x":0.63279, "y":6.87976, "heading":0.0, "vx":-0.20231, "vy":3.59846, "omega":0.0, "ax":0.50328, "ay":-8.95172, "alpha":0.0, "fx":[8.56059,8.56059,8.56059,8.56059], "fy":[-152.26625,-152.26625,-152.26625,-152.26625]},
{"t":0.50024, "x":0.6233, "y":7.04857, "heading":0.0, "vx":-0.17713, "vy":3.15066, "omega":0.0, "ax":0.50498, "ay":-8.9821, "alpha":0.0, "fx":[8.58964,8.58964,8.58964,8.58964], "fy":[-152.78301,-152.78301,-152.78301,-152.78301]},
{"t":0.55026, "x":0.61507, "y":7.19494, "heading":0.0, "vx":-0.15187, "vy":2.70134, "omega":0.0, "ax":0.50555, "ay":-8.99225, "alpha":0.0, "fx":[8.59934,8.59934,8.59934,8.59934], "fy":[-152.95563,-152.95563,-152.95563,-152.95563]},
{"t":0.60029, "x":0.6081, "y":7.31882, "heading":0.0, "vx":-0.12658, "vy":2.25152, "omega":0.0, "ax":0.50584, "ay":-8.99733, "alpha":0.0, "fx":[8.6042,8.6042,8.6042,8.6042], "fy":[-153.042,-153.042,-153.042,-153.042]},
{"t":0.65031, "x":0.6024, "y":7.42019, "heading":0.0, "vx":-0.10128, "vy":1.80144, "omega":0.0, "ax":0.50601, "ay":-9.00038, "alpha":0.0, "fx":[8.60711,8.60711,8.60711,8.60711], "fy":[-153.09384,-153.09384,-153.09384,-153.09384]},
{"t":0.70033, "x":0.59797, "y":7.49905, "heading":0.0, "vx":-0.07597, "vy":1.3512, "omega":0.0, "ax":0.50613, "ay":-9.00241, "alpha":0.0, "fx":[8.60906,8.60906,8.60906,8.60906], "fy":[-153.12841,-153.12841,-153.12841,-153.12841]},
{"t":0.75036, "x":0.5948, "y":7.55537, "heading":0.0, "vx":-0.05065, "vy":0.90087, "omega":0.0, "ax":0.50621, "ay":-9.00386, "alpha":0.0, "fx":[8.61044,8.61044,8.61044,8.61044], "fy":[-153.1531,-153.1531,-153.1531,-153.1531]},
{"t":0.80038, "x":0.5929, "y":7.58917, "heading":0.0, "vx":-0.02533, "vy":0.45046, "omega":0.0, "ax":0.50627, "ay":-9.00495, "alpha":0.0, "fx":[8.61149,8.61149,8.6115,8.61149], "fy":[-153.17162,-153.17162,-153.17162,-153.17162]},
{"t":0.75036, "x":0.5948, "y":7.55537, "heading":0.0, "vx":-0.05065, "vy":0.90087, "omega":0.0, "ax":0.50621, "ay":-9.00386, "alpha":0.0, "fx":[8.61045,8.61045,8.61045,8.61045], "fy":[-153.1531,-153.1531,-153.1531,-153.1531]},
{"t":0.80038, "x":0.5929, "y":7.58917, "heading":0.0, "vx":-0.02533, "vy":0.45046, "omega":0.0, "ax":0.50627, "ay":-9.00495, "alpha":0.0, "fx":[8.61149,8.61149,8.61149,8.61149], "fy":[-153.17162,-153.17162,-153.17162,-153.17162]},
{"t":0.8504, "x":0.59227, "y":7.60044, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[0.0,0.0,0.0,0.0], "fy":[0.0,0.0,0.0,0.0]}],
"splits":[0]
},
Expand Down
Loading
Loading