Skip to content

Commit

Permalink
fix merge conflicts and update some paths
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinthebinn
shinthebinn committed Mar 30, 2024
2 parents 28cda63 + fa0e57b commit 9e8a55f
Show file tree
Hide file tree
Showing 29 changed files with 6,203 additions and 4,258 deletions.
3,295 changes: 1,794 additions & 1,501 deletions choreo.chor
View file

Large diffs are not rendered by default.

345 changes: 141 additions & 204 deletions src/main/deploy/choreo/2 piece left.1.traj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,217 +4,154 @@
"x": 0.6235248446464539,
"y": 6.866034507751465,
"heading": 1.3037,
"angularVelocity": 2.3321158035498043e-24,
"velocityX": -1.6085262930190747e-26,
"velocityY": -4.0384459981982936e-25,
"angularVelocity": 2.7068477576187765e-23,
"velocityX": -4.853948155553872e-23,
"velocityY": -6.243185313363585e-23,
"timestamp": 0
},
{
"x": 0.6371648015347651,
"y": 6.867786445253041,
"heading": 1.3036999632733615,
"angularVelocity": -7.263599506268419e-7,
"velocityX": 0.26976382275301153,
"velocityY": 0.03464888940043332,
"timestamp": 0.050562587485274306
},
{
"x": 0.6644447150656874,
"y": 6.871290320309862,
"heading": 1.303699886456694,
"angularVelocity": -0.0000015192392509530055,
"velocityX": 0.5395276406466987,
"velocityY": 0.0692977798622562,
"timestamp": 0.10112517497054861
},
{
"x": 0.7053645848706707,
"y": 6.876546133002426,
"heading": 1.3036997645049127,
"angularVelocity": -0.0000024118975620600877,
"velocityX": 0.809291451251395,
"velocityY": 0.10394667191616248,
"timestamp": 0.1516877624558229
},
{
"x": 0.759924410335464,
"y": 6.8835538834649,
"heading": 1.303699589009544,
"angularVelocity": -0.0000034708541873039917,
"velocityX": 1.0790552497077626,
"velocityY": 0.13859556662353859,
"timestamp": 0.20225034994109722
},
{
"x": 0.8281241902315634,
"y": 6.892313571965616,
"heading": 1.3036993431536497,
"angularVelocity": -0.000004862407296943842,
"velocityX": 1.3488190238674322,
"velocityY": 0.17324446663784457,
"timestamp": 0.2528129374263715
},
{
"x": 0.909963920873441,
"y": 6.902825199309566,
"heading": 1.3036989764864741,
"angularVelocity": -0.000007251748650640463,
"velocityX": 1.61858272513669,
"velocityY": 0.20789338257286122,
"timestamp": 0.3033755249116458
},
{
"x": 0.9952199524201776,
"y": 6.913775599360361,
"heading": 1.2650877104567244,
"angularVelocity": -0.763633111952482,
"velocityX": 1.6861485099346676,
"velocityY": 0.21657119612368925,
"timestamp": 0.35393811239692013
},
{
"x": 1.08047598194801,
"y": 6.924726015129663,
"heading": 1.1860996824058685,
"angularVelocity": -1.5621832659149426,
"velocityX": 1.6861484700058589,
"velocityY": 0.21657150699596817,
"timestamp": 0.40450069988219445
},
{
"x": 1.165732011476475,
"y": 6.93567643089404,
"heading": 1.068522180672941,
"angularVelocity": -2.325385380389609,
"velocityX": 1.6861484700183644,
"velocityY": 0.21657150689860336,
"timestamp": 0.45506328736746876
},
{
"x": 1.25098804100406,
"y": 6.94662684666527,
"heading": 0.9153751201313117,
"angularVelocity": -3.0288612224647617,
"velocityX": 1.6861484700009595,
"velocityY": 0.2165715070341085,
"timestamp": 0.505625874852743
},
{
"x": 1.3362440705163487,
"y": 6.957577262555589,
"heading": 0.7326430566977549,
"angularVelocity": -3.6139776961923715,
"velocityX": 1.6861484696984423,
"velocityY": 0.21657150938939215,
"timestamp": 0.5561884623380173
},
{
"x": 1.4215001000011822,
"y": 6.968527678659667,
"heading": 0.5352466423996767,
"angularVelocity": -3.904001438920968,
"velocityX": 1.6861484691554405,
"velocityY": 0.21657151361700638,
"timestamp": 0.6067510498232916
},
{
"x": 1.5067561295108884,
"y": 6.9794780945700925,
"heading": 0.35194096302396116,
"angularVelocity": -3.6253223676320148,
"velocityX": 1.6861484696473656,
"velocityY": 0.2165715097870587,
"timestamp": 0.657313637308566
},
{
"x": 1.5920121590364624,
"y": 6.99042851035698,
"heading": 0.19809518233895146,
"angularVelocity": -3.0426801383496302,
"velocityX": 1.6861484699611848,
"velocityY": 0.21657150734378086,
"timestamp": 0.7078762247938403
},
{
"x": 1.6772681885652982,
"y": 7.001378926118472,
"heading": 0.07976876190025861,
"angularVelocity": -2.3401970967793897,
"velocityX": 1.6861484700257006,
"velocityY": 0.21657150684148851,
"timestamp": 0.7584388122791146
"x": 0.6479605553240734,
"y": 6.869173065177977,
"heading": 1.3036998817532777,
"angularVelocity": -0.0000017472450406683682,
"velocityX": 0.3610685643473286,
"velocityY": 0.04637615983684271,
"timestamp": 0.06767609559638565
},
{
"x": 0.6968319743321776,
"y": 6.875450180817172,
"heading": 1.3036996103660266,
"angularVelocity": -0.000004010090249051131,
"velocityX": 0.722137094012766,
"velocityY": 0.09275233129037688,
"timestamp": 0.1353521911927713
},
{
"x": 0.7701390946293506,
"y": 6.884865857027548,
"heading": 1.303699081157409,
"angularVelocity": -0.00000781972738083724,
"velocityX": 1.083205519632373,
"velocityY": 0.13912853759369243,
"timestamp": 0.20302828678915696
},
{
"x": 0.8641136418785188,
"y": 6.89693604798726,
"heading": 1.2781268289721,
"angularVelocity": -0.3778624041466495,
"velocityX": 1.388592920750396,
"velocityY": 0.17835235400838984,
"timestamp": 0.2707043823855426
},
{
"x": 0.958088185941953,
"y": 6.909006263750245,
"heading": 1.1796751937375807,
"angularVelocity": -1.4547475643641785,
"velocityX": 1.3885928736771431,
"velocityY": 0.17835272050816342,
"timestamp": 0.3383804779819283
},
{
"x": 1.0520627300139076,
"y": 6.921076479446895,
"heading": 1.0124911373568812,
"angularVelocity": -2.4703561118207933,
"velocityX": 1.3885928738030422,
"velocityY": 0.178352719527955,
"timestamp": 0.40605657357831393
},
{
"x": 1.1460372740816214,
"y": 6.933146695176562,
"heading": 0.785208686841268,
"angularVelocity": -3.358385978279628,
"velocityX": 1.3885928737403777,
"velocityY": 0.17835272001583247,
"timestamp": 0.4737326691746996
},
{
"x": 1.2400118181361255,
"y": 6.945216911009073,
"heading": 0.5237947450805,
"angularVelocity": -3.862721976749634,
"velocityX": 1.3885928735451927,
"velocityY": 0.1783527215354694,
"timestamp": 0.5414087647710852
},
{
"x": 1.3339863622028791,
"y": 6.9572871267462135,
"heading": 0.2954599282674446,
"angularVelocity": -3.3739360227697586,
"velocityX": 1.388592873726193,
"velocityY": 0.17835272012626976,
"timestamp": 0.6090848603674709
},
{
"x": 1.4279609062740386,
"y": 6.969357342449054,
"heading": 0.126956229009992,
"angularVelocity": -2.489855506180409,
"velocityX": 1.3885928737912927,
"velocityY": 0.17835271961943208,
"timestamp": 0.6767609559638565
},
{
"x": 1.521935450341706,
"y": 6.981427558179083,
"heading": 0.027070659114329158,
"angularVelocity": -1.4759357645478204,
"velocityX": 1.3885928737396922,
"velocityY": 0.1783527200211782,
"timestamp": 0.7444370515602422
},
{
"x": 1.6159099957667231,
"y": 6.993497763341015,
"heading": 9.235413386651335e-7,
"angularVelocity": -0.3999896172266207,
"velocityX": 1.388592893796256,
"velocityY": 0.1783525638641785,
"timestamp": 0.8121131471566279
},
{
"x": 1.6892171169315986,
"y": 7.002913432795811,
"heading": 3.921850758219532e-7,
"angularVelocity": -0.000007851461556117877,
"velocityX": 1.0832055324537762,
"velocityY": 0.13912843777145287,
"timestamp": 0.8797892427530135
},
{
"x": 1.7380885363341119,
"y": 7.00919054536428,
"heading": 1.1913070878580363e-7,
"angularVelocity": -0.000004034723998627552,
"velocityX": 0.7221370998406585,
"velocityY": 0.09275228591651416,
"timestamp": 0.9474653383493992
},
{
"x": 1.7625242471694946,
"y": 7.0123291015625,
"heading": 8.02748616433338e-24,
"angularVelocity": -1.577624205317622,
"velocityX": 1.686149045062736,
"velocityY": 0.21656675397035893,
"timestamp": 0.8090013997643889
},
{
"x": 1.894717013309512,
"y": 7.013383749891871,
"heading": -0.04465409215915743,
"angularVelocity": -0.574233690167933,
"velocityX": 1.6999458782753816,
"velocityY": 0.013562353923706081,
"timestamp": 0.8867643261195083
},
{
"x": 2.026909781256637,
"y": 7.014438171688664,
"heading": -6.873205041659995e-7,
"angularVelocity": 0.5742248515023068,
"velocityX": 1.6999459015140637,
"velocityY": 0.013559440805737809,
"timestamp": 0.9645272524746277
},
{
"x": 2.1570162459060764,
"y": 7.015475952303694,
"heading": -4.0701288137533413e-7,
"angularVelocity": 0.0000036046434455229545,
"velocityX": 1.6731168790547177,
"velocityY": 0.0133454418920676,
"timestamp": 1.0422901788297472
},
{
"x": 2.25459609761466,
"y": 7.016254287790654,
"heading": -2.021152112745776e-7,
"angularVelocity": 0.000002634901741802409,
"velocityX": 1.2548377007182918,
"velocityY": 0.010009081749382266,
"timestamp": 1.1200531051848666
},
{
"x": 2.3196493330208185,
"y": 7.016773178122739,
"heading": -6.706257500555856e-8,
"angularVelocity": 0.0000017367226594878274,
"velocityX": 0.8365584791534231,
"velocityY": 0.006672721262003089,
"timestamp": 1.197816031539986
},
{
"x": 2.3521759510040283,
"y": 7.017032623291016,
"heading": -5.459567245742045e-24,
"angularVelocity": 8.62397779364737e-7,
"velocityX": 0.4182792431790796,
"velocityY": 0.0033363606597260143,
"timestamp": 1.2755789578951053
},
{
"x": 2.3521759510040283,
"y": 7.017032623291016,
"heading": -3.0375060318554146e-24,
"angularVelocity": 7.015482005050734e-25,
"velocityX": -5.736202459306136e-26,
"velocityY": 3.1210527485389075e-25,
"timestamp": 1.3533418842502247
"heading": -6.978679086372593e-23,
"angularVelocity": -0.000001760307058732952,
"velocityX": 0.3610685666784826,
"velocityY": 0.04637614168728246,
"timestamp": 1.015141433945785
},
{
"x": 1.7625242471694946,
"y": 7.0123291015625,
"heading": -3.402897415947517e-23,
"angularVelocity": 2.5545845274476152e-23,
"velocityX": -1.6289861869168524e-23,
"velocityY": -2.7174652182389944e-23,
"timestamp": 1.0828175295421705
}
],
"eventMarkers": []
Expand Down
Loading

0 comments on commit 9e8a55f

Please sign in to comment.