Skip to content

Make autos fit time limit better #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TaylerUva merged 11 commits into from
Aug 30, 2026
Merged

Make autos fit time limit better #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
389e209
made autos take less time
BrodyKarr Aug 15, 2026
84c8594
made autos faster
BrodyKarr Aug 16, 2026
21cce02
Merge branch 'main' into Make-Autos-fit-time-limit-better
BrodyKarr Aug 16, 2026
7feb7cd
Merge branch 'main' into Make-Autos-fit-time-limit-better
BrodyKarr Aug 16, 2026
8b55d96
fixed conflicts
BrodyKarr Aug 16, 2026
f81cfef
regenerated paths
BrodyKarr Aug 16, 2026
4dfa994
changed values to constants
Justinpham17386769 Aug 29, 2026
0fed779
deleted the unused consts
Justinpham17386769 Aug 29, 2026
22c45be
made autos shorter and fixxed consts
Justinpham17386769 Aug 29, 2026
4f835ce
Merge branch 'main' into Make-Autos-fit-time-limit-better
Justinpham17386769 Aug 29, 2026
c1841c6
removed unused const in freespin
Justinpham17386769 Aug 30, 2026
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
168 changes: 84 additions & 84 deletions src/main/deploy/choreo/DSideAllianceToDepot.traj
View file
Open in desktop

Large diffs are not rendered by default.

106 changes: 53 additions & 53 deletions src/main/deploy/choreo/DSideAllianceToTrench.traj
View file
Open in desktop

Large diffs are not rendered by default.

94 changes: 59 additions & 35 deletions src/main/deploy/choreo/DSideBumpToDepot.traj
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions src/main/deploy/choreo/DSideCornerToDSideTrench.traj
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions src/main/deploy/choreo/DSideTrenchToNeutral.traj
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions src/main/deploy/choreo/DepotToCorner.traj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{"x":0.5922702550888062, "y":7.600440979003906, "heading":0.0, "intervals":40, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}],
"constraints":[
{"from":"first", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
{"from":"last", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
{"from":"last", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":false},
{"from":"first", "to":"last", "data":{"type":"KeepInRectangle", "props":{"x":0.0, "y":0.0, "w":16.541, "h":8.0692}}, "enabled":false},
{"from":0, "to":0, "data":{"type":"MaxAngularVelocity", "props":{"max":0.0001}}, "enabled":true},
{"from":0, "to":1, "data":{"type":"KeepInLane", "props":{"tolerance":0.01}}, "enabled":true},
Expand All @@ -21,7 +21,7 @@
{"x":{"exp":"0.5922702550888062 m", "val":0.5922702550888062}, "y":{"exp":"7.600440979003906 m", "val":7.600440979003906}, "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},
{"from":"last", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":true},
{"from":"last", "to":null, "data":{"type":"StopPoint", "props":{}}, "enabled":false},
{"from":"first", "to":"last", "data":{"type":"KeepInRectangle", "props":{"x":{"exp":"0 m", "val":0.0}, "y":{"exp":"0 m", "val":0.0}, "w":{"exp":"16.541 m", "val":16.541}, "h":{"exp":"8.0692 m", "val":8.0692}}}, "enabled":false},
{"from":0, "to":0, "data":{"type":"MaxAngularVelocity", "props":{"max":{"exp":"1e-4 rad / s", "val":0.0001}}}, "enabled":true},
{"from":0, "to":1, "data":{"type":"KeepInLane", "props":{"tolerance":{"exp":"0.01 m", "val":0.01}}}, "enabled":true},
Expand Down Expand Up @@ -57,26 +57,26 @@
"differentialTrackWidth":0.5588
},
"sampleType":"Swerve",
"waypoints":[0.0,0.8504],
"waypoints":[0.0,0.60364],
"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.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.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.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]}],
{"t":0.0, "x":0.68343, "y":5.97907, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":-0.50611, "ay":9.00211, "alpha":0.0, "fx":[-8.60877,-8.60877,-8.60877,-8.60877], "fy":[153.12334,153.12334,153.12334,153.12334]},
{"t":0.03551, "x":0.68311, "y":5.98475, "heading":0.0, "vx":-0.01797, "vy":0.31965, "omega":0.0, "ax":-0.50607, "ay":9.00136, "alpha":0.0, "fx":[-8.60806,-8.60806,-8.60806,-8.60806], "fy":[153.11058,153.11058,153.11058,153.11058]},
{"t":0.07102, "x":0.68215, "y":6.00177, "heading":0.0, "vx":-0.03594, "vy":0.63927, "omega":0.0, "ax":-0.50602, "ay":9.0005, "alpha":0.0, "fx":[-8.60723,-8.60723,-8.60723,-8.60723], "fy":[153.09585,153.09585,153.09585,153.09585]},
{"t":0.10652, "x":0.68055, "y":6.03015, "heading":0.0, "vx":-0.05391, "vy":0.95887, "omega":0.0, "ax":-0.50596, "ay":8.99948, "alpha":0.0, "fx":[-8.60626,-8.60626,-8.60626,-8.60626], "fy":[153.07866,153.07866,153.07866,153.07866]},
{"t":0.14203, "x":0.67832, "y":6.06987, "heading":0.0, "vx":-0.07187, "vy":1.27842, "omega":0.0, "ax":-0.50589, "ay":8.99829, "alpha":0.0, "fx":[-8.60512,-8.60512,-8.60512,-8.60512], "fy":[153.05834,153.05834,153.05834,153.05834]},
{"t":0.17754, "x":0.67545, "y":6.12094, "heading":0.0, "vx":-0.08984, "vy":1.59794, "omega":0.0, "ax":-0.50581, "ay":8.99685, "alpha":0.0, "fx":[-8.60375,-8.60375,-8.60375,-8.60375], "fy":[153.03393,153.03393,153.03393,153.03393]},
{"t":0.21305, "x":0.67194, "y":6.18335, "heading":0.0, "vx":-0.1078, "vy":1.9174, "omega":0.0, "ax":-0.50572, "ay":8.9951, "alpha":0.0, "fx":[-8.60207,-8.60207,-8.60207,-8.60207], "fy":[153.00407,153.00407,153.00407,153.00407]},
{"t":0.24856, "x":0.66779, "y":6.2571, "heading":0.0, "vx":-0.12576, "vy":2.2368, "omega":0.0, "ax":-0.50559, "ay":8.9929, "alpha":0.0, "fx":[-8.59997,-8.59997,-8.59997,-8.59997], "fy":[152.96672,152.96672,152.96672,152.96672]},
{"t":0.28407, "x":0.66301, "y":6.3422, "heading":0.0, "vx":-0.14371, "vy":2.55612, "omega":0.0, "ax":-0.50543, "ay":8.99008, "alpha":0.0, "fx":[-8.59726,-8.59726,-8.59726,-8.59726], "fy":[152.91865,152.91865,152.91865,152.91865]},
{"t":0.31957, "x":0.65759, "y":6.43863, "heading":0.0, "vx":-0.16166, "vy":2.87535, "omega":0.0, "ax":-0.50522, "ay":8.9863, "alpha":0.0, "fx":[-8.59366,-8.59366,-8.59366,-8.59366], "fy":[152.85446,152.85446,152.85446,152.85446]},
{"t":0.35508, "x":0.65153, "y":6.54639, "heading":0.0, "vx":-0.17959, "vy":3.19443, "omega":0.0, "ax":-0.50492, "ay":8.98101, "alpha":0.0, "fx":[-8.5886,-8.5886,-8.5886,-8.5886], "fy":[152.76446,152.76446,152.76446,152.76446]},
{"t":0.39059, "x":0.64483, "y":6.66548, "heading":0.0, "vx":-0.19752, "vy":3.51333, "omega":0.0, "ax":-0.50448, "ay":8.97306, "alpha":0.0, "fx":[-8.58099,-8.58099,-8.58099,-8.58099], "fy":[152.62918,152.62918,152.62918,152.62918]},
{"t":0.4261, "x":0.6375, "y":6.79589, "heading":0.0, "vx":-0.21544, "vy":3.83195, "omega":0.0, "ax":-0.50373, "ay":8.95977, "alpha":0.0, "fx":[-8.56828,-8.56828,-8.56828,-8.56828], "fy":[152.40309,152.40309,152.40309,152.40309]},
{"t":0.46161, "x":0.62954, "y":6.93761, "heading":0.0, "vx":-0.23332, "vy":4.1501, "omega":0.0, "ax":-0.50223, "ay":8.93309, "alpha":0.0, "fx":[-8.54277,-8.54277,-8.54277,-8.54277], "fy":[151.94929,151.94929,151.94929,151.94929]},
{"t":0.49712, "x":0.62093, "y":7.0906, "heading":0.0, "vx":-0.25116, "vy":4.4673, "omega":0.0, "ax":-0.49772, "ay":8.85281, "alpha":0.0, "fx":[-8.46599,-8.46599,-8.46599,-8.46599], "fy":[150.58369,150.58369,150.58369,150.58369]},
{"t":0.53262, "x":0.6117, "y":7.25481, "heading":0.0, "vx":-0.26883, "vy":4.78165, "omega":0.0, "ax":-0.18293, "ay":3.25371, "alpha":0.0, "fx":[-3.11154,-3.11154,-3.11154,-3.11154], "fy":[55.34459,55.34459,55.34459,55.34459]},
{"t":0.56813, "x":0.60204, "y":7.42665, "heading":0.0, "vx":-0.27533, "vy":4.89718, "omega":0.0, "ax":0.00861, "ay":-0.15323, "alpha":0.0, "fx":[0.14654,0.14654,0.14654,0.14654], "fy":[-2.6064,-2.6064,-2.6064,-2.6064]},
{"t":0.60364, "x":0.59227, "y":7.60044, "heading":0.0, "vx":-0.27502, "vy":4.89174, "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
Loading