Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions simgui-ds.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@
}
],
"robotJoysticks": [
{
"guid": "78696e70757401000000000000000000",
"useGamepad": true
},
{
"guid": "Keyboard2"
}
Expand Down
110 changes: 37 additions & 73 deletions src/main/deploy/choreo/1.traj

Large diffs are not rendered by default.

138 changes: 46 additions & 92 deletions src/main/deploy/choreo/3.traj

Large diffs are not rendered by default.

196 changes: 77 additions & 119 deletions src/main/deploy/choreo/4.traj

Large diffs are not rendered by default.

172 changes: 57 additions & 115 deletions src/main/deploy/choreo/6.traj

Large diffs are not rendered by default.

68 changes: 23 additions & 45 deletions src/main/deploy/choreo/7.traj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version":1,
"snapshot":{
"waypoints":[
{"x":7.276, "y":5.70271635055542, "heading":0.0, "intervals":41, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
{"x":7.276, "y":5.70271635055542, "heading":0.0, "intervals":19, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
{"x":6.4, "y":5.70271635055542, "heading":0.0, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
"constraints":[
{"from":"first", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
Expand All @@ -13,7 +13,7 @@
},
"params":{
"waypoints":[
{"x":{"exp":"ALG.x - 10 in", "val":7.276}, "y":{"exp":"ALG.y + 0.5 m", "val":5.70271635055542}, "heading":{"exp":"ALG.heading", "val":0.0}, "intervals":41, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
{"x":{"exp":"ALG.x - 10 in", "val":7.276}, "y":{"exp":"ALG.y + 0.5 m", "val":5.70271635055542}, "heading":{"exp":"ALG.heading", "val":0.0}, "intervals":19, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false},
{"x":{"exp":"6.4 m", "val":6.4}, "y":{"exp":"ALG.y + 0.5 m", "val":5.70271635055542}, "heading":{"exp":"0 rad", "val":0.0}, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
"constraints":[
{"from":"first", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
Expand All @@ -26,50 +26,28 @@
},
"trajectory":{
"sampleType":"Swerve",
"waypoints":[0.0,2.02276],
"waypoints":[0.0,0.93173],
"samples":[
{"t":0.0, "x":7.276, "y":5.70272, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":-0.85755, "ay":0.0, "alpha":0.0, "fx":[-14.29495,-14.29495,-14.29495,-14.29495], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.04934, "x":7.27496, "y":5.70272, "heading":0.0, "vx":-0.04231, "vy":0.0, "omega":0.0, "ax":-0.85751, "ay":0.0, "alpha":0.0, "fx":[-14.29432,-14.29432,-14.29432,-14.29432], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.09867, "x":7.27183, "y":5.70272, "heading":0.0, "vx":-0.08461, "vy":0.0, "omega":0.0, "ax":-0.85747, "ay":0.0, "alpha":0.0, "fx":[-14.29363,-14.29363,-14.29363,-14.29363], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.14801, "x":7.26661, "y":5.70272, "heading":0.0, "vx":-0.12692, "vy":0.0, "omega":0.0, "ax":-0.85742, "ay":0.0, "alpha":0.0, "fx":[-14.29285,-14.29285,-14.29285,-14.29285], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.19734, "x":7.2593, "y":5.70272, "heading":0.0, "vx":-0.16922, "vy":0.0, "omega":0.0, "ax":-0.85737, "ay":0.0, "alpha":0.0, "fx":[-14.29198,-14.29198,-14.29198,-14.29198], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.24668, "x":7.24991, "y":5.70272, "heading":0.0, "vx":-0.21152, "vy":0.0, "omega":0.0, "ax":-0.85731, "ay":0.0, "alpha":0.0, "fx":[-14.291,-14.291,-14.291,-14.291], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.29601, "x":7.23843, "y":5.70272, "heading":0.0, "vx":-0.25381, "vy":0.0, "omega":0.0, "ax":-0.85725, "ay":0.0, "alpha":0.0, "fx":[-14.28987,-14.28987,-14.28987,-14.28987], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.34535, "x":7.22487, "y":5.70272, "heading":0.0, "vx":-0.29611, "vy":0.0, "omega":0.0, "ax":-0.85717, "ay":0.0, "alpha":0.0, "fx":[-14.28856,-14.28856,-14.28856,-14.28856], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.39468, "x":7.20921, "y":5.70272, "heading":0.0, "vx":-0.3384, "vy":0.0, "omega":0.0, "ax":-0.85708, "ay":0.0, "alpha":0.0, "fx":[-14.28705,-14.28705,-14.28705,-14.28705], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.44402, "x":7.19148, "y":5.70272, "heading":0.0, "vx":-0.38068, "vy":0.0, "omega":0.0, "ax":-0.85697, "ay":0.0, "alpha":0.0, "fx":[-14.28525,-14.28525,-14.28525,-14.28525], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.49336, "x":7.17165, "y":5.70272, "heading":0.0, "vx":-0.42296, "vy":0.0, "omega":0.0, "ax":-0.85684, "ay":0.0, "alpha":0.0, "fx":[-14.2831,-14.2831,-14.2831,-14.2831], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.54269, "x":7.14974, "y":5.70272, "heading":0.0, "vx":-0.46523, "vy":0.0, "omega":0.0, "ax":-0.85668, "ay":0.0, "alpha":0.0, "fx":[-14.28046,-14.28046,-14.28046,-14.28046], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.59203, "x":7.12575, "y":5.70272, "heading":0.0, "vx":-0.5075, "vy":0.0, "omega":0.0, "ax":-0.85648, "ay":0.0, "alpha":0.0, "fx":[-14.27718,-14.27718,-14.27718,-14.27718], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.64136, "x":7.09967, "y":5.70272, "heading":0.0, "vx":-0.54975, "vy":0.0, "omega":0.0, "ax":-0.85623, "ay":0.0, "alpha":0.0, "fx":[-14.27295,-14.27295,-14.27295,-14.27295], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.6907, "x":7.0715, "y":5.70272, "heading":0.0, "vx":-0.59199, "vy":0.0, "omega":0.0, "ax":-0.85589, "ay":0.0, "alpha":0.0, "fx":[-14.26731,-14.26731,-14.26731,-14.26731], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.74003, "x":7.04126, "y":5.70272, "heading":0.0, "vx":-0.63422, "vy":0.0, "omega":0.0, "ax":-0.85542, "ay":0.0, "alpha":0.0, "fx":[-14.25943,-14.25943,-14.25943,-14.25943], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.78937, "x":7.00892, "y":5.70272, "heading":0.0, "vx":-0.67642, "vy":0.0, "omega":0.0, "ax":-0.85471, "ay":0.0, "alpha":0.0, "fx":[-14.24761,-14.24761,-14.24761,-14.24761], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.83871, "x":6.97451, "y":5.70272, "heading":0.0, "vx":-0.71859, "vy":0.0, "omega":0.0, "ax":-0.85353, "ay":0.0, "alpha":0.0, "fx":[-14.22793,-14.22793,-14.22793,-14.22793], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.88804, "x":6.93802, "y":5.70272, "heading":0.0, "vx":-0.7607, "vy":0.0, "omega":0.0, "ax":-0.85117, "ay":0.0, "alpha":0.0, "fx":[-14.18865,-14.18865,-14.18865,-14.18865], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.93738, "x":6.89946, "y":5.70272, "heading":0.0, "vx":-0.80269, "vy":0.0, "omega":0.0, "ax":-0.84414, "ay":0.0, "alpha":0.0, "fx":[-14.07149,-14.07149,-14.07149,-14.07149], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.98671, "x":6.85883, "y":5.70272, "heading":0.0, "vx":-0.84434, "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]},
{"t":1.03605, "x":6.81717, "y":5.70272, "heading":0.0, "vx":-0.84434, "vy":0.0, "omega":0.0, "ax":0.84414, "ay":0.0, "alpha":0.0, "fx":[14.07149,14.07149,14.07149,14.07149], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.08538, "x":6.77654, "y":5.70272, "heading":0.0, "vx":-0.80269, "vy":0.0, "omega":0.0, "ax":0.85117, "ay":0.0, "alpha":0.0, "fx":[14.18865,14.18865,14.18865,14.18865], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.13472, "x":6.73798, "y":5.70272, "heading":0.0, "vx":-0.7607, "vy":0.0, "omega":0.0, "ax":0.85353, "ay":0.0, "alpha":0.0, "fx":[14.22793,14.22793,14.22793,14.22793], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.18405, "x":6.70149, "y":5.70272, "heading":0.0, "vx":-0.71859, "vy":0.0, "omega":0.0, "ax":0.85471, "ay":0.0, "alpha":0.0, "fx":[14.24761,14.24761,14.24761,14.24761], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.23339, "x":6.66708, "y":5.70272, "heading":0.0, "vx":-0.67642, "vy":0.0, "omega":0.0, "ax":0.85542, "ay":0.0, "alpha":0.0, "fx":[14.25943,14.25943,14.25943,14.25943], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.28273, "x":6.63474, "y":5.70272, "heading":0.0, "vx":-0.63422, "vy":0.0, "omega":0.0, "ax":0.85589, "ay":0.0, "alpha":0.0, "fx":[14.26731,14.26731,14.26731,14.26731], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.33206, "x":6.6045, "y":5.70272, "heading":0.0, "vx":-0.59199, "vy":0.0, "omega":0.0, "ax":0.85623, "ay":0.0, "alpha":0.0, "fx":[14.27295,14.27295,14.27295,14.27295], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.3814, "x":6.57633, "y":5.70272, "heading":0.0, "vx":-0.54975, "vy":0.0, "omega":0.0, "ax":0.85648, "ay":0.0, "alpha":0.0, "fx":[14.27718,14.27718,14.27718,14.27718], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.43073, "x":6.55025, "y":5.70272, "heading":0.0, "vx":-0.5075, "vy":0.0, "omega":0.0, "ax":0.85668, "ay":0.0, "alpha":0.0, "fx":[14.28046,14.28046,14.28046,14.28046], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.48007, "x":6.52626, "y":5.70272, "heading":0.0, "vx":-0.46523, "vy":0.0, "omega":0.0, "ax":0.85684, "ay":0.0, "alpha":0.0, "fx":[14.2831,14.2831,14.2831,14.2831], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.5294, "x":6.50435, "y":5.70272, "heading":0.0, "vx":-0.42296, "vy":0.0, "omega":0.0, "ax":0.85697, "ay":0.0, "alpha":0.0, "fx":[14.28525,14.28525,14.28525,14.28525], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.57874, "x":6.48452, "y":5.70272, "heading":0.0, "vx":-0.38068, "vy":0.0, "omega":0.0, "ax":0.85708, "ay":0.0, "alpha":0.0, "fx":[14.28705,14.28705,14.28705,14.28705], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.62807, "x":6.46679, "y":5.70272, "heading":0.0, "vx":-0.3384, "vy":0.0, "omega":0.0, "ax":0.85717, "ay":0.0, "alpha":0.0, "fx":[14.28856,14.28856,14.28856,14.28856], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.67741, "x":6.45113, "y":5.70272, "heading":0.0, "vx":-0.29611, "vy":0.0, "omega":0.0, "ax":0.85725, "ay":0.0, "alpha":0.0, "fx":[14.28987,14.28987,14.28987,14.28987], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.72675, "x":6.43757, "y":5.70272, "heading":0.0, "vx":-0.25381, "vy":0.0, "omega":0.0, "ax":0.85731, "ay":0.0, "alpha":0.0, "fx":[14.291,14.291,14.291,14.291], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.77608, "x":6.42609, "y":5.70272, "heading":0.0, "vx":-0.21152, "vy":0.0, "omega":0.0, "ax":0.85737, "ay":0.0, "alpha":0.0, "fx":[14.29198,14.29198,14.29198,14.29198], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.82542, "x":6.4167, "y":5.70272, "heading":0.0, "vx":-0.16922, "vy":0.0, "omega":0.0, "ax":0.85742, "ay":0.0, "alpha":0.0, "fx":[14.29285,14.29285,14.29285,14.29285], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.87475, "x":6.40939, "y":5.70272, "heading":0.0, "vx":-0.12692, "vy":0.0, "omega":0.0, "ax":0.85747, "ay":0.0, "alpha":0.0, "fx":[14.29363,14.29363,14.29363,14.29363], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.92409, "x":6.40417, "y":5.70272, "heading":0.0, "vx":-0.08461, "vy":0.0, "omega":0.0, "ax":0.85751, "ay":0.0, "alpha":0.0, "fx":[14.29432,14.29432,14.29432,14.29432], "fy":[0.0,0.0,0.0,0.0]},
{"t":1.97342, "x":6.40104, "y":5.70272, "heading":0.0, "vx":-0.04231, "vy":0.0, "omega":0.0, "ax":0.85755, "ay":0.0, "alpha":0.0, "fx":[14.29495,14.29495,14.29495,14.29495], "fy":[0.0,0.0,0.0,0.0]},
{"t":2.02276, "x":6.4, "y":5.70272, "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]}],
{"t":0.0, "x":7.276, "y":5.70272, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":-4.05033, "ay":0.0, "alpha":0.0, "fx":[-57.41251,-57.41251,-57.41251,-57.41251], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.04904, "x":7.27113, "y":5.70272, "heading":0.0, "vx":-0.19862, "vy":0.0, "omega":0.0, "ax":-4.0499, "ay":0.0, "alpha":0.0, "fx":[-57.40636,-57.40636,-57.40636,-57.40636], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.09808, "x":7.25652, "y":5.70272, "heading":0.0, "vx":-0.39722, "vy":0.0, "omega":0.0, "ax":-4.04934, "ay":0.0, "alpha":0.0, "fx":[-57.39845,-57.39845,-57.39845,-57.39845], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.14711, "x":7.23217, "y":5.70272, "heading":0.0, "vx":-0.59579, "vy":0.0, "omega":0.0, "ax":-4.0486, "ay":0.0, "alpha":0.0, "fx":[-57.3879,-57.3879,-57.3879,-57.3879], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.19615, "x":7.19809, "y":5.70272, "heading":0.0, "vx":-0.79433, "vy":0.0, "omega":0.0, "ax":-4.04756, "ay":0.0, "alpha":0.0, "fx":[-57.37314,-57.37314,-57.37314,-57.37314], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.24519, "x":7.15427, "y":5.70272, "heading":0.0, "vx":-0.99281, "vy":0.0, "omega":0.0, "ax":-4.04599, "ay":0.0, "alpha":0.0, "fx":[-57.35101,-57.35101,-57.35101,-57.35101], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.29423, "x":7.10072, "y":5.70272, "heading":0.0, "vx":-1.19122, "vy":0.0, "omega":0.0, "ax":-4.04339, "ay":0.0, "alpha":0.0, "fx":[-57.31413,-57.31413,-57.31413,-57.31413], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.34327, "x":7.03744, "y":5.70272, "heading":0.0, "vx":-1.3895, "vy":0.0, "omega":0.0, "ax":-4.0382, "ay":0.0, "alpha":0.0, "fx":[-57.24046,-57.24046,-57.24046,-57.24046], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.39231, "x":6.96445, "y":5.70272, "heading":0.0, "vx":-1.58753, "vy":0.0, "omega":0.0, "ax":-4.02264, "ay":0.0, "alpha":0.0, "fx":[-57.02,-57.02,-57.02,-57.02], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.44134, "x":6.88176, "y":5.70272, "heading":0.0, "vx":-1.78479, "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]},
{"t":0.49038, "x":6.79424, "y":5.70272, "heading":0.0, "vx":-1.78479, "vy":0.0, "omega":0.0, "ax":4.02264, "ay":0.0, "alpha":0.0, "fx":[57.02,57.02,57.02,57.02], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.53942, "x":6.71155, "y":5.70272, "heading":0.0, "vx":-1.58753, "vy":0.0, "omega":0.0, "ax":4.0382, "ay":0.0, "alpha":0.0, "fx":[57.24046,57.24046,57.24046,57.24046], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.58846, "x":6.63856, "y":5.70272, "heading":0.0, "vx":-1.3895, "vy":0.0, "omega":0.0, "ax":4.04339, "ay":0.0, "alpha":0.0, "fx":[57.31413,57.31413,57.31413,57.31413], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.6375, "x":6.57528, "y":5.70272, "heading":0.0, "vx":-1.19122, "vy":0.0, "omega":0.0, "ax":4.04599, "ay":0.0, "alpha":0.0, "fx":[57.35101,57.35101,57.35101,57.35101], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.68653, "x":6.52173, "y":5.70272, "heading":0.0, "vx":-0.99281, "vy":0.0, "omega":0.0, "ax":4.04756, "ay":0.0, "alpha":0.0, "fx":[57.37314,57.37314,57.37314,57.37314], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.73557, "x":6.47791, "y":5.70272, "heading":0.0, "vx":-0.79433, "vy":0.0, "omega":0.0, "ax":4.0486, "ay":0.0, "alpha":0.0, "fx":[57.3879,57.3879,57.3879,57.3879], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.78461, "x":6.44383, "y":5.70272, "heading":0.0, "vx":-0.59579, "vy":0.0, "omega":0.0, "ax":4.04934, "ay":0.0, "alpha":0.0, "fx":[57.39845,57.39845,57.39845,57.39845], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.83365, "x":6.41948, "y":5.70272, "heading":0.0, "vx":-0.39722, "vy":0.0, "omega":0.0, "ax":4.0499, "ay":0.0, "alpha":0.0, "fx":[57.40636,57.40636,57.40636,57.40636], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.88269, "x":6.40487, "y":5.70272, "heading":0.0, "vx":-0.19862, "vy":0.0, "omega":0.0, "ax":4.05033, "ay":0.0, "alpha":0.0, "fx":[57.41251,57.41251,57.41251,57.41251], "fy":[0.0,0.0,0.0,0.0]},
{"t":0.93173, "x":6.4, "y":5.70272, "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]
},
"events":[]
Expand Down
Loading