Skip to content

Commit

Permalink
champs code, final commit from me
Browse files Browse the repository at this point in the history
  • Loading branch information
@eshen7
eshen7 committed Apr 22, 2024
1 parent a861197 commit 3500288
Show file tree
Hide file tree
Showing 24 changed files with 5,105 additions and 5,820 deletions.
3,873 changes: 1,804 additions & 2,069 deletions choreo.chor
View file

Large diffs are not rendered by default.

178 changes: 80 additions & 98 deletions src/main/deploy/choreo/f1 to shoot1.1.traj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,127 +4,109 @@
"x": 7.961704730987549,
"y": 7.241039276123047,
"heading": 0.21655092038213267,
"angularVelocity": 4.981180662149831e-24,
"velocityX": -6.719323194407064e-23,
"velocityY": 4.3048075727332904e-23,
"angularVelocity": -9.535649047066089e-25,
"velocityX": -1.615094162739453e-22,
"velocityY": 3.341482238054441e-24,
"timestamp": 0
},
{
"x": 7.856893943608807,
"y": 7.223393016800376,
"heading": 0.22086889922853897,
"angularVelocity": 0.04628935565604085,
"velocityX": -1.1235867488332119,
"velocityY": -0.18917044358975532,
"timestamp": 0.09328232776648729
"x": 7.8534057404660516,
"y": 7.217598753589746,
"heading": 0.21865043835225856,
"angularVelocity": 0.02204389502213844,
"velocityX": -1.137085565367329,
"velocityY": -0.2461138343851241,
"timestamp": 0.09524260426831846
},
{
"x": 7.647272375661322,
"y": 7.188100499190848,
"heading": 0.2295048373279949,
"angularVelocity": 0.09257850126847378,
"velocityX": -2.2471734246620745,
"velocityY": -0.37834087608142947,
"timestamp": 0.18656465553297458
"x": 7.636807762130017,
"y": 7.170717709107486,
"heading": 0.22284947292294296,
"angularVelocity": 0.04408777566450056,
"velocityX": -2.2741711022826943,
"velocityY": -0.49222766264112555,
"timestamp": 0.19048520853663692
},
{
"x": 7.332840047563704,
"y": 7.135161726565406,
"heading": 0.24245868223294312,
"angularVelocity": 0.13886708463553196,
"velocityX": -3.3707598816014284,
"velocityY": -0.5675112734886462,
"timestamp": 0.2798469832994619
"x": 7.311910804115973,
"y": 7.100396144429941,
"heading": 0.22914802007018414,
"angularVelocity": 0.0661316140568442,
"velocityX": -3.4112565538497472,
"velocityY": -0.7383414724677235,
"timestamp": 0.2857278128049554
},
{
"x": 6.9222185362247775,
"y": 7.0660282569878925,
"heading": 0.24245868481258714,
"angularVelocity": 2.7654155697109347e-8,
"velocityX": -4.401921791302751,
"velocityY": -0.741120759241254,
"timestamp": 0.37312931106594915
"x": 6.896381584804082,
"y": 7.0104578912643625,
"heading": 0.22914802055003616,
"angularVelocity": 5.03820729860651e-9,
"velocityX": -4.362850244454903,
"velocityY": -0.9443069501966594,
"timestamp": 0.38097041707327384
},
{
"x": 6.511597024885694,
"y": 6.996894787410461,
"heading": 0.24245868739217177,
"angularVelocity": 2.765351916270918e-8,
"velocityX": -4.401921791306968,
"velocityY": -0.7411207592286453,
"timestamp": 0.4664116388324364
"x": 6.480852365486123,
"y": 6.920519638098752,
"heading": 0.22914802102988593,
"angularVelocity": 5.038184182446416e-9,
"velocityX": -4.36285024445505,
"velocityY": -0.944306950196671,
"timestamp": 0.47621302134159227
},
{
"x": 6.10097551354657,
"y": 6.927761317833576,
"heading": 0.24245868997175646,
"angularVelocity": 2.765351980901144e-8,
"velocityX": -4.401921791306968,
"velocityY": -0.7411207592286454,
"timestamp": 0.5596939665989237
"x": 6.065323146173007,
"y": 6.830581384932946,
"heading": 0.22914802150973596,
"angularVelocity": 5.038186679093132e-9,
"velocityX": -4.362850244455049,
"velocityY": -0.9443069501966705,
"timestamp": 0.5714556256099107
},
{
"x": 5.690354002207105,
"y": 6.858627848256586,
"heading": 0.24245869255134098,
"angularVelocity": 2.765351781784004e-8,
"velocityX": -4.401921791306967,
"velocityY": -0.7411207592286451,
"timestamp": 0.6529762943654109
"x": 5.6497939268563355,
"y": 6.740643131768568,
"heading": 0.2291480219895878,
"angularVelocity": 5.0382060451330294e-9,
"velocityX": -4.3628502444549,
"velocityY": -0.9443069501966679,
"timestamp": 0.6666982298782291
},
{
"x": 5.279732490868614,
"y": 6.789494378680031,
"heading": 0.2424586951309257,
"angularVelocity": 2.7653519867283043e-8,
"velocityX": -4.401921791306969,
"velocityY": -0.7411207592286455,
"timestamp": 0.7462586221318982
"x": 5.324896968845828,
"y": 6.670321567057189,
"heading": 0.23544656780036308,
"angularVelocity": 0.06613160002461636,
"velocityX": -3.411256553792981,
"velocityY": -0.7383414728182498,
"timestamp": 0.7619408341465476
},
{
"x": 4.869110979529308,
"y": 6.720360909101532,
"heading": 0.24245869771056971,
"angularVelocity": 2.7654155586181237e-8,
"velocityX": -4.40192179130236,
"velocityY": -0.7411207592435782,
"timestamp": 0.8395409498983855
"x": 5.108298990523064,
"y": 6.623440522548629,
"heading": 0.23964560134171203,
"angularVelocity": 0.04408776485699008,
"velocityX": -2.274171102236718,
"velocityY": -0.49222766292147224,
"timestamp": 0.857183438414866
},
{
"x": 4.554678651346717,
"y": 6.6674221351077705,
"heading": 0.2554124329212092,
"angularVelocity": 0.13886590869672988,
"velocityX": -3.370759882514779,
"velocityY": -0.567511288163847,
"timestamp": 0.9328232776648727
"x": 5,
"y": 6.6,
"heading": 0.2417451187809186,
"angularVelocity": 0.02204388944774934,
"velocityX": -1.137085565341525,
"velocityY": -0.2461138345392403,
"timestamp": 0.9524260426831844
},
{
"x": 4.345057083336579,
"y": 6.632129616402199,
"heading": 0.26404828499911387,
"angularVelocity": 0.09257757910504502,
"velocityX": -2.247173425334044,
"velocityY": -0.3783408878312955,
"timestamp": 1.02610560543136
},
{
"x": 4.240246295928955,
"y": 6.61448335647583,
"heading": 0.2683662182268339,
"angularVelocity": 0.04628886661714775,
"velocityX": -1.1235867491433966,
"velocityY": -0.18917045005734734,
"timestamp": 1.1193879331978474
},
{
"x": 4.240246295928955,
"y": 6.61448335647583,
"heading": 0.2683662182268339,
"angularVelocity": -4.33612645678028e-24,
"velocityX": -6.280781952209572e-23,
"velocityY": 6.20506937198531e-23,
"timestamp": 1.2126702609643347
"x": 5,
"y": 6.6,
"heading": 0.2417451187809186,
"angularVelocity": -1.6054386909702919e-24,
"velocityX": -2.15517376912993e-22,
"velocityY": 4.416402563141544e-24,
"timestamp": 1.0476686469515029
}
],
"eventMarkers": []
Expand Down
Loading

0 comments on commit 3500288

Please sign in to comment.