Skip to content

Commit 6c9f0dd

Browse files
DylanTaylor29DylanTaylor29
authored
tuned autonomous (#113)
1 parent 5756f34 commit 6c9f0dd

File tree

6 files changed

+230
-208
lines changed

6 files changed

+230
-208
lines changed

‎src/main/deploy/choreo/Pi.chor

+6-6
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@
235235
"val":7.2
236236
},
237237
"y":{
238-
"exp":"4 m",
239-
"val":4.0
238+
"exp":"3.8 m",
239+
"val":3.8
240240
},
241241
"heading":{
242242
"exp":"180 rad",
@@ -347,8 +347,8 @@
347347
"val":11.75
348348
},
349349
"y":{
350-
"exp":"4.05 m",
351-
"val":4.05
350+
"exp":"4.2 m",
351+
"val":4.2
352352
},
353353
"heading":{
354354
"exp":"0 rad",
@@ -473,8 +473,8 @@
473473
"val":10.35
474474
},
475475
"y":{
476-
"exp":"4.05 m",
477-
"val":4.05
476+
"exp":"4.2 m",
477+
"val":4.2
478478
},
479479
"heading":{
480480
"exp":"0 rad",

‎src/main/deploy/choreo/blueCenterToL4G.traj

+91-92
Large diffs are not rendered by default.

‎src/main/deploy/choreo/redCenterToL4G.traj

+85-84
Large diffs are not rendered by default.

‎src/main/deploy/choreo/redL4GBack.traj

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"params":{
1616
"waypoints":[
17-
{"x":{"exp":"redL4G.x", "val":11.75}, "y":{"exp":"redL4G.y", "val":4.05}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":17, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
18-
{"x":{"exp":"11 m", "val":11.0}, "y":{"exp":"redL4G.y", "val":4.05}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
17+
{"x":{"exp":"redL4G.x", "val":11.75}, "y":{"exp":"redL4G.y", "val":4.2}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":17, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
18+
{"x":{"exp":"11 m", "val":11.0}, "y":{"exp":"redL4G.y", "val":4.2}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
1919
"constraints":[
2020
{"from":"first", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
2121
{"from":"last", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},

‎src/main/deploy/choreo/redL4GToAlgae.traj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"params":{
1515
"waypoints":[
16-
{"x":{"exp":"redL4G.x", "val":11.75}, "y":{"exp":"redL4G.y", "val":4.05}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":3, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
16+
{"x":{"exp":"redL4G.x", "val":11.75}, "y":{"exp":"redL4G.y", "val":4.2}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":3, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
1717
{"x":{"exp":"redAlgae.x", "val":11.75}, "y":{"exp":"redAlgae.y", "val":4.0}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":61, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
1818
"constraints":[
1919
{"from":"first", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},

‎src/main/deploy/choreo/redMoveAuto.traj

+45-23
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,63 @@
33
"version":1,
44
"snapshot":{
55
"waypoints":[
6-
{"x":12.00515842437744, "y":0.5982385277748108, "heading":0.0, "intervals":15, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
7-
{"x":10.356978416442873, "y":0.5502332448959351, "heading":0.0, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
8-
"constraints":[],
6+
{"x":10.356978416442873, "y":0.5502332448959351, "heading":0.0, "intervals":35, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
7+
{"x":12.00515842437744, "y":0.5982385277748108, "heading":0.0, "intervals":15, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
8+
"constraints":[
9+
{"from":0, "to":1, "data":{"type":"MaxVelocity", "props":{"max":1.0}}, "enabled":true}],
910
"targetDt":0.05
1011
},
1112
"params":{
1213
"waypoints":[
13-
{"x":{"exp":"12.005158424377441 m", "val":12.00515842437744}, "y":{"exp":"0.5982385277748108 m", "val":0.5982385277748108}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":15, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
14-
{"x":{"exp":"10.356978416442871 m", "val":10.356978416442873}, "y":{"exp":"0.5502332448959351 m", "val":0.5502332448959351}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
15-
"constraints":[],
14+
{"x":{"exp":"10.356978416442871 m", "val":10.356978416442873}, "y":{"exp":"0.5502332448959351 m", "val":0.5502332448959351}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":35, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
15+
{"x":{"exp":"12.005158424377441 m", "val":12.00515842437744}, "y":{"exp":"0.5982385277748108 m", "val":0.5982385277748108}, "heading":{"exp":"0 deg", "val":0.0}, "intervals":15, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
16+
"constraints":[
17+
{"from":0, "to":1, "data":{"type":"MaxVelocity", "props":{"max":{"exp":"1 m / s", "val":1.0}}}, "enabled":true}],
1618
"targetDt":{
1719
"exp":"0.05 s",
1820
"val":0.05
1921
}
2022
},
2123
"trajectory":{
2224
"sampleType":"Swerve",
23-
"waypoints":[0.0,0.52369],
25+
"waypoints":[0.0,1.64925],
2426
"samples":[
25-
{"t":0.0, "x":12.00516, "y":0.59824, "heading":0.0, "vx":-3.14391, "vy":-0.09157, "omega":0.0, "ax":-0.10305, "ay":-0.003, "alpha":0.0, "fx":[-1.16861,-1.16861,-1.16861,-1.16861], "fy":[-0.03404,-0.03404,-0.03404,-0.03404]},
26-
{"t":0.03491, "x":11.89533, "y":0.59504, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "omega":0.0, "ax":-0.00001, "ay":0.0, "alpha":0.0, "fx":[-0.00013,-0.00013,-0.00013,-0.00013], "fy":[0.0,0.0,0.0,0.0]},
27-
{"t":0.06982, "x":11.78545, "y":0.59184, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
28-
{"t":0.10474, "x":11.67556, "y":0.58864, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
29-
{"t":0.13965, "x":11.56567, "y":0.58544, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
30-
{"t":0.17456, "x":11.45579, "y":0.58224, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
31-
{"t":0.20947, "x":11.3459, "y":0.57904, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
32-
{"t":0.24439, "x":11.23601, "y":0.57584, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
33-
{"t":0.2793, "x":11.12612, "y":0.57264, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
34-
{"t":0.31421, "x":11.01624, "y":0.56943, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
35-
{"t":0.34912, "x":10.90635, "y":0.56623, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
36-
{"t":0.38404, "x":10.79646, "y":0.56303, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
37-
{"t":0.41895, "x":10.68658, "y":0.55983, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "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]},
38-
{"t":0.45386, "x":10.57669, "y":0.55663, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "omega":0.0, "ax":0.00001, "ay":0.0, "alpha":0.0, "fx":[0.00013,0.00013,0.00013,0.00013], "fy":[0.0,0.0,0.0,0.0]},
39-
{"t":0.48877, "x":10.4668, "y":0.55343, "heading":0.0, "vx":-3.14751, "vy":-0.09168, "omega":0.0, "ax":0.10305, "ay":0.003, "alpha":0.0, "fx":[1.16861,1.16861,1.16861,1.16861], "fy":[0.03404,0.03404,0.03404,0.03404]},
40-
{"t":0.52369, "x":10.35698, "y":0.55023, "heading":0.0, "vx":-3.14391, "vy":-0.09157, "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]}],
27+
{"t":0.0, "x":10.35698, "y":0.55023, "heading":0.0, "vx":0.99873, "vy":0.02909, "omega":0.0, "ax":0.0135, "ay":0.00039, "alpha":0.0, "fx":[0.1531,0.1531,0.1531,0.1531], "fy":[0.00446,0.00446,0.00446,0.00446]},
28+
{"t":0.04712, "x":10.40405, "y":0.5516, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
29+
{"t":0.09424, "x":10.45115, "y":0.55298, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
30+
{"t":0.14136, "x":10.49824, "y":0.55435, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
31+
{"t":0.18849, "x":10.54533, "y":0.55572, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
32+
{"t":0.23561, "x":10.59242, "y":0.55709, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
33+
{"t":0.28273, "x":10.63951, "y":0.55846, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
34+
{"t":0.32985, "x":10.6866, "y":0.55983, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
35+
{"t":0.37697, "x":10.73369, "y":0.56121, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
36+
{"t":0.42409, "x":10.78079, "y":0.56258, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
37+
{"t":0.47121, "x":10.82788, "y":0.56395, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
38+
{"t":0.51834, "x":10.87497, "y":0.56532, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
39+
{"t":0.56546, "x":10.92206, "y":0.56669, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
40+
{"t":0.61258, "x":10.96915, "y":0.56806, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
41+
{"t":0.6597, "x":11.01624, "y":0.56944, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
42+
{"t":0.70682, "x":11.06333, "y":0.57081, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
43+
{"t":0.75394, "x":11.11043, "y":0.57218, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
44+
{"t":0.80106, "x":11.15752, "y":0.57355, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
45+
{"t":0.84819, "x":11.20461, "y":0.57492, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
46+
{"t":0.89531, "x":11.2517, "y":0.57629, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
47+
{"t":0.94243, "x":11.29879, "y":0.57766, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
48+
{"t":0.98955, "x":11.34588, "y":0.57904, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
49+
{"t":1.03667, "x":11.39297, "y":0.58041, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
50+
{"t":1.08379, "x":11.44007, "y":0.58178, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
51+
{"t":1.13091, "x":11.48716, "y":0.58315, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
52+
{"t":1.17803, "x":11.53425, "y":0.58452, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
53+
{"t":1.22516, "x":11.58134, "y":0.58589, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
54+
{"t":1.27228, "x":11.62843, "y":0.58727, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
55+
{"t":1.3194, "x":11.67552, "y":0.58864, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
56+
{"t":1.36652, "x":11.72261, "y":0.59001, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
57+
{"t":1.41364, "x":11.76971, "y":0.59138, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
58+
{"t":1.46076, "x":11.8168, "y":0.59275, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
59+
{"t":1.50788, "x":11.86389, "y":0.59412, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
60+
{"t":1.55501, "x":11.91098, "y":0.5955, "heading":0.0, "vx":0.99936, "vy":0.02911, "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]},
61+
{"t":1.60213, "x":11.95807, "y":0.59687, "heading":0.0, "vx":0.99936, "vy":0.02911, "omega":0.0, "ax":-0.0045, "ay":-0.00013, "alpha":0.0, "fx":[-0.05105,-0.05105,-0.05105,-0.05105], "fy":[-0.00149,-0.00149,-0.00149,-0.00149]},
62+
{"t":1.64925, "x":12.00516, "y":0.59824, "heading":0.0, "vx":0.99915, "vy":0.0291, "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]}],
4163
"splits":[0]
4264
},
4365
"events":[]

0 commit comments

Comments
 (0)