Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1d4f932
added tons of setpoints
PotatoBoyH4 Jan 28, 2025
1376efc
added a ton of traj's. fixed small problems and started on flipping t…
PotatoBoyH4 Jan 29, 2025
cdc2512
started making our first full auton command
PotatoBoyH4 Jan 31, 2025
494b88b
added a new constant to choreo, the deep startpoint
PotatoBoyH4 Feb 3, 2025
82e4acd
added some more setpoints and related paths
PotatoBoyH4 Feb 5, 2025
4af74e2
fixed two constants
PotatoBoyH4 Feb 10, 2025
f3e3c6f
Merge branch 'main' into path-creation-1
PotatoBoyH4 Feb 10, 2025
7025585
Merge branch 'main' into path-creation-1
PotatoBoyH4 Feb 24, 2025
773923a
post merge
PotatoBoyH4 Feb 24, 2025
a35af84
sort of did stuff
PotatoBoyH4 Feb 25, 2025
e5d4307
fixed everything except pathHandler
PotatoBoyH4 Feb 25, 2025
05adf00
hopefully fixed pathHandler
PotatoBoyH4 Feb 26, 2025
5400cc5
sort of fixed pathHandler
PotatoBoyH4 Feb 27, 2025
92fb7a8
made paths work in theory, but it goes crazy
PotatoBoyH4 Feb 28, 2025
131c7d2
fix vy and ay on mirrorToProcessor
PotatoBoyH4 Feb 28, 2025
9437c58
tweak paths, get reset working
mwitcpalek Mar 1, 2025
f25f904
tweaks to auto constants
mwitcpalek Mar 1, 2025
1b70dbe
path tweaks and testing
mwitcpalek Mar 2, 2025
4f960b0
more path tweaks
mwitcpalek Mar 2, 2025
6785d6a
radius too small
ds12a Mar 2, 2025
b5c6944
tag servoing for path handler
ds12a Mar 2, 2025
7ae0a13
initial add of servoing
mwitcpalek Mar 3, 2025
ba13690
auto path tweaks
mwitcpalek Mar 3, 2025
f0f15b0
spotless
mwitcpalek Mar 3, 2025
725c109
add check for biscuit error
mwitcpalek Mar 3, 2025
a9d3663
spotless
mwitcpalek Mar 3, 2025
51d77c3
fixed some paths
PotatoBoyH4 Mar 3, 2025
2dcbb9b
mirroring broken
ds12a Mar 4, 2025
a87b6e6
fix up processor auto sequence (no elevator)
mwitcpalek Mar 4, 2025
8735741
uncomment elevator (untested)
mwitcpalek Mar 4, 2025
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
302 changes: 288 additions & 14 deletions src/main/deploy/choreo/2025-project.chor
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,227 @@
"version":1,
"type":"Swerve",
"variables":{
"expressions":{},
"expressions":{
"endEffectorOffset":{
"dimension":"Number",
"var":{
"exp":"9.408839",
"val":9.408839
}
}
},
"poses":{
"startpos":{
"A":{
"x":{
"exp":"3.2654999999999994 m",
"val":3.2654999999999994
},
"y":{
"exp":"4.3359 m",
"val":4.3359
},
"heading":{
"exp":"0 rad",
"val":0.0
}
},
"B":{
"x":{
"exp":"3.2654999999999994 m",
"val":3.2654999999999994
},
"y":{
"exp":"4.0009 m",
"val":4.0009
},
"heading":{
"exp":"0 deg",
"val":0.0
}
},
"C":{
"x":{
"exp":"3.6132737518457456 m",
"val":3.6132737518457456
},
"y":{
"exp":"3.1185381922643174 m",
"val":3.1185381922643174
},
"heading":{
"exp":"60 deg",
"val":1.0471975511965976
}
},
"D":{
"x":{
"exp":"3.89906213509461 m",
"val":3.89906213509461
},
"y":{
"exp":"2.953538192264317 m",
"val":2.953538192264317
},
"heading":{
"exp":"60 deg",
"val":1.0471975511965976
}
},
"E":{
"x":{
"exp":"4.837096751845746 m",
"val":4.837096751845746
},
"y":{
"exp":"2.813538192264317 m",
"val":2.813538192264317
},
"heading":{
"exp":"120 deg",
"val":2.0943951023931953
}
},
"F":{
"x":{
"exp":"5.122885135094611 m",
"val":5.122885135094611
},
"y":{
"exp":"2.978538192264317 m",
"val":2.978538192264317
},
"heading":{
"exp":"120 deg",
"val":2.0943951023931953
}
},
"G":{
"x":{
"exp":"5.713146 m",
"val":5.713146
},
"y":{
"exp":"3.7209 m",
"val":3.7209
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"H":{
"x":{
"exp":"5.713146 m",
"val":5.713146
},
"y":{
"exp":"4.0509 m",
"val":4.0509
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"I":{
"x":{
"exp":"5.365372248154253 m",
"val":5.365372248154253
},
"y":{
"exp":"4.933261807735684 m",
"val":4.933261807735684
},
"heading":{
"exp":"240 deg",
"val":4.1887902047863905
}
},
"J":{
"x":{
"exp":"5.079583864905389 m",
"val":5.079583864905389
},
"y":{
"exp":"5.098261807735684 m",
"val":5.098261807735684
},
"heading":{
"exp":"240 deg",
"val":4.1887902047863905
}
},
"K":{
"x":{
"exp":"4.141549248154255 m",
"val":4.141549248154255
},
"y":{
"exp":"5.238261807735684 m",
"val":5.238261807735684
},
"heading":{
"exp":"300 deg",
"val":5.235987755982989
}
},
"L":{
"x":{
"exp":"3.85576086490539 m",
"val":3.85576086490539
},
"y":{
"exp":"5.073261807735684 m",
"val":5.073261807735684
},
"heading":{
"exp":"300 deg",
"val":5.235987755982989
}
},
"barge":{
"x":{
"exp":"305.5 in",
"val":7.7597
},
"y":{
"exp":"4.3597 m",
"val":4.3597
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"fetch":{
"x":{
"exp":"1.744809627532959 m",
"val":1.744809627532959
},
"y":{
"exp":"7.167456150054932 m",
"val":7.167456150054932
},
"heading":{
"exp":"-54.01 deg",
"val":-0.9426523290021374
}
},
"fetchP":{
"x":{
"exp":"1.74 m",
"val":1.74
},
"y":{
"exp":"0.8818 m",
"val":0.8818
},
"heading":{
"exp":"54.01 deg",
"val":0.9426523290021374
}
},
"start":{
"x":{
"exp":"7.1008875 m",
"val":7.1008875
Expand All @@ -18,6 +236,62 @@
"exp":"180 deg",
"val":3.141592653589793
}
},
"startDeep":{
"x":{
"exp":"7.1008875 m",
"val":7.1008875
},
"y":{
"exp":"7.2570308 m",
"val":7.2570308
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"startG":{
"x":{
"exp":"7.1008875 m",
"val":7.1008875
},
"y":{
"exp":"142.621161 in",
"val":3.6225774894
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"startH":{
"x":{
"exp":"7.1008875 m",
"val":7.1008875
},
"y":{
"exp":"155.561161 in",
"val":3.9512534894
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
},
"startP":{
"x":{
"exp":"7.1 m",
"val":7.1
},
"y":{
"exp":"2.97 m",
"val":2.97
},
"heading":{
"exp":"180 deg",
"val":3.141592653589793
}
}
}
},
Expand All @@ -43,20 +317,20 @@
}
},
"mass":{
"exp":"150 lbs",
"val":68.0388555
"exp":"147 lbs",
"val":66.67807839000001
},
"inertia":{
"exp":"6 kg m ^ 2",
"val":6.0
},
"gearing":{
"exp":"6.5",
"val":6.5
"exp":"7.09",
"val":7.09
},
"radius":{
"exp":"1.75 in",
"val":0.04445
"exp":"1.68 in",
"val":0.042671999999999995
},
"vmax":{
"exp":"6000 RPM",
Expand All @@ -72,16 +346,16 @@
},
"bumper":{
"front":{
"exp":"17.9375 in",
"val":0.4556125
"exp":"18.5 in",
"val":0.4699
},
"side":{
"exp":"17.9375 in",
"val":0.4556125
"exp":"18.5 in",
"val":0.4699
},
"back":{
"exp":"17.9375 in",
"val":0.4556125
"exp":"18.5 in",
"val":0.4699
}
},
"differentialTrackWidth":{
Expand Down
Loading