Skip to content

Commit

Permalink
end of comp changes!
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinthebinn
shinthebinn committed Mar 24, 2024
1 parent a72854a commit e63e371
Show file tree
Hide file tree
Showing 25 changed files with 5,633 additions and 4,235 deletions.
3,327 changes: 1,846 additions & 1,481 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": -1.8232741591844444e-18,
"velocityX": 7.12403473371085e-18,
"velocityY": -2.6478556818989226e-17,
"angularVelocity": -4.322191282064769e-19,
"velocityX": -7.217119807256306e-20,
"velocityY": -5.737284120005055e-18,
"timestamp": 0
},
{
"x": 0.6371647021269348,
"y": 6.867787221776129,
"heading": 1.30369672515582,
"angularVelocity": -0.00006476812380618724,
"velocityX": 0.26976183581085494,
"velocityY": 0.03466424437509273,
"timestamp": 0.05056259140393951
},
{
"x": 0.6644444154536387,
"y": 6.871292657837969,
"heading": 1.3036900282942052,
"angularVelocity": -0.00013244696185552165,
"velocityX": 0.5395236393002303,
"velocityY": 0.06932864721736587,
"timestamp": 0.10112518280787902
},
{
"x": 0.7053639821708213,
"y": 6.876550827985717,
"heading": 1.303679688712071,
"angularVelocity": -0.0002044907479422861,
"velocityX": 0.8092853942211979,
"velocityY": 0.10399328835306255,
"timestamp": 0.15168777421181853
},
{
"x": 0.7599233981740878,
"y": 6.8835617523794905,
"heading": 1.303665338742152,
"angularVelocity": -0.00028380606137315504,
"velocityX": 1.0790470679676354,
"velocityY": 0.1386583282048117,
"timestamp": 0.20225036561575804
},
{
"x": 0.8281226552122382,
"y": 6.892325471630372,
"heading": 1.303646243766396,
"angularVelocity": -0.0003776502593285092,
"velocityX": 1.3488085785262331,
"velocityY": 0.17332417124092056,
"timestamp": 0.2528129570196975
},
{
"x": 0.9099617281962122,
"y": 6.902842109861635,
"heading": 1.3036202050692922,
"angularVelocity": -0.0005149794814836402,
"velocityX": 1.618569592886762,
"velocityY": 0.20799246912103908,
"timestamp": 0.303375548423637
},
{
"x": 0.9952174677554063,
"y": 6.913794817693266,
"heading": 1.2650372111423984,
"angularVelocity": -0.7630739021791462,
"velocityX": 1.686142604481928,
"velocityY": 0.21661682139925917,
"timestamp": 0.3539381398275765
},
{
"x": 1.0804727987833038,
"y": 6.9247507050181865,
"heading": 1.186135227119023,
"angularVelocity": -1.5604814119006516,
"velocityX": 1.6861345247675534,
"velocityY": 0.21667970372394155,
"timestamp": 0.404500731231516
},
{
"x": 1.1657282386661474,
"y": 6.935705745230898,
"heading": 1.0686962835514935,
"angularVelocity": -2.322644870578755,
"velocityX": 1.6861366776426912,
"velocityY": 0.21666294998988928,
"timestamp": 0.45506332263545546
},
{
"x": 1.2509836774698653,
"y": 6.946660793838387,
"heading": 0.9157151714041298,
"angularVelocity": -3.0255789487768316,
"velocityX": 1.6861366563003188,
"velocityY": 0.21666311601734475,
"timestamp": 0.5056259140393949
},
{
"x": 1.336239105659407,
"y": 6.957615925046211,
"heading": 0.7330874583136245,
"angularVelocity": -3.61191363060312,
"velocityX": 1.6861364463787976,
"velocityY": 0.21666474964277663,
"timestamp": 0.5561885054433344
},
{
"x": 1.4214945304345679,
"y": 6.96857108283117,
"heading": 0.5355420616291058,
"angularVelocity": -3.9069476306376054,
"velocityX": 1.6861363788509953,
"velocityY": 0.21666527527119953,
"timestamp": 0.6067510968472739
},
{
"x": 1.5067500117706687,
"y": 6.979525800477682,
"heading": 0.35218632067901057,
"angularVelocity": -3.6263121778170837,
"velocityX": 1.68613749748313,
"velocityY": 0.21665657044742084,
"timestamp": 0.6573136882512134
},
{
"x": 1.5920056795979993,
"y": 6.990479066662584,
"heading": 0.19830964964916573,
"angularVelocity": -3.043290835324073,
"velocityX": 1.6861411858073423,
"velocityY": 0.21662786421283695,
"timestamp": 0.7078762796551529
},
{
"x": 1.677260793789504,
"y": 7.001436641396165,
"heading": 0.07990683643812377,
"angularVelocity": -2.341707770971106,
"velocityX": 1.686130236292877,
"velocityY": 0.21671307639360837,
"timestamp": 0.7584388710590924
"x": 0.6479605438901133,
"y": 6.869173153614982,
"heading": 1.3036976853929116,
"angularVelocity": -0.00003420125047541537,
"velocityX": 0.3610683967062306,
"velocityY": 0.04637746677385236,
"timestamp": 0.06767609535082215
},
{
"x": 0.6968319343921952,
"y": 6.875450489923095,
"heading": 1.3036923603900246,
"angularVelocity": -0.00007868366015476742,
"velocityX": 0.7221366754204779,
"velocityY": 0.0927555922895904,
"timestamp": 0.1353521907016443
},
{
"x": 0.7701389910336393,
"y": 6.884866659045138,
"heading": 1.3036818951032874,
"angularVelocity": -0.0001546378626426958,
"velocityX": 1.0832045829687984,
"velocityY": 0.13913582149253725,
"timestamp": 0.20302828605246648
},
{
"x": 0.8641137016555179,
"y": 6.896935578985996,
"heading": 1.278165357348036,
"angularVelocity": -0.377039154268251,
"velocityX": 1.3885953398275834,
"velocityY": 0.17833357374260927,
"timestamp": 0.2707043814032886
},
{
"x": 0.9580882030461527,
"y": 6.909006127999201,
"heading": 1.179816306963164,
"angularVelocity": -1.4532317485966955,
"velocityX": 1.3885922481710244,
"velocityY": 0.17835764534927084,
"timestamp": 0.33838047675411076
},
{
"x": 1.052062741771001,
"y": 6.921076386345661,
"heading": 1.012746961397015,
"angularVelocity": -2.4686611232531686,
"velocityX": 1.3885927998313032,
"velocityY": 0.17835335038004493,
"timestamp": 0.4060565721049329
},
{
"x": 1.1460372822563507,
"y": 6.933146630985501,
"heading": 0.7854621166033714,
"angularVelocity": -3.358421368955095,
"velocityX": 1.3885928258449378,
"velocityY": 0.17835314784740675,
"timestamp": 0.47373266745575504
},
{
"x": 1.2400118226682206,
"y": 6.945216876197425,
"heading": 0.5235178410871962,
"angularVelocity": -3.870558343508111,
"velocityX": 1.388592824759185,
"velocityY": 0.17835315630066892,
"timestamp": 0.5414087628065772
},
{
"x": 1.3339863634408795,
"y": 6.9572871186003775,
"heading": 0.29518267414695665,
"angularVelocity": -3.3739412085846014,
"velocityX": 1.3885928300902979,
"velocityY": 0.17835311479456636,
"timestamp": 0.6090848581573994
},
{
"x": 1.4279609034991196,
"y": 6.9693573665655375,
"heading": 0.1268000189106551,
"angularVelocity": -2.4880669365369346,
"velocityX": 1.388592819533854,
"velocityY": 0.1783531969832136,
"timestamp": 0.6767609535082216
},
{
"x": 1.5219354277832027,
"y": 6.981427737341889,
"heading": 0.027024429838266126,
"angularVelocity": -1.4743106639821368,
"velocityX": 1.38859258645071,
"velocityY": 0.1783550116740703,
"timestamp": 0.7444370488590438
},
{
"x": 1.615910044720068,
"y": 6.993497386738595,
"heading": 0.000018019004787293556,
"angularVelocity": -0.3990539154701806,
"velocityX": 1.3885939555128846,
"velocityY": 0.17834435237639756,
"timestamp": 0.812113144209866
},
{
"x": 1.6892171360383907,
"y": 7.002913285881713,
"heading": 0.000007615738994617179,
"angularVelocity": -0.00015372142465942866,
"velocityX": 1.083205095363587,
"velocityY": 0.13913183221207334,
"timestamp": 0.8797892395606882
},
{
"x": 1.7380885418555654,
"y": 7.0091905029584325,
"heading": 0.0000023106612364746317,
"angularVelocity": -0.00007838924114270227,
"velocityX": 0.7221369017203642,
"velocityY": 0.09275383049478103,
"timestamp": 0.9474653349115104
},
{
"x": 1.7625242471694946,
"y": 7.0123291015625,
"heading": -3.350712590761302e-17,
"angularVelocity": -1.5803548477125327,
"velocityX": 1.6862951643207778,
"velocityY": 0.21542527516670237,
"timestamp": 0.8090014624630318
},
{
"x": 1.894716655716008,
"y": 7.013428377195941,
"heading": -0.044649055027065385,
"angularVelocity": -0.5741688805746129,
"velocityX": 1.6999411788133891,
"velocityY": 0.01413624229031357,
"timestamp": 0.886764393436201
},
{
"x": 2.02690952861163,
"y": 7.014470317880742,
"heading": -0.00008383158388879456,
"angularVelocity": 0.5730908401401845,
"velocityX": 1.6999471501560728,
"velocityY": 0.013398937922744884,
"timestamp": 0.9645273244093701
},
{
"x": 2.1570160896928328,
"y": 7.015495222736415,
"heading": -0.0000539532537599614,
"angularVelocity": 0.00038422330222239603,
"velocityX": 1.673118019768238,
"velocityY": 0.013179864015495759,
"timestamp": 1.042290255382539
},
{
"x": 2.2545960183213234,
"y": 7.01626391842549,
"heading": -0.00002792078971867657,
"angularVelocity": 0.00033476701193603026,
"velocityX": 1.254838615357224,
"velocityY": 0.009885117233306755,
"timestamp": 1.1200531863557082
},
{
"x": 2.319649306326726,
"y": 7.016776387311738,
"heading": -0.000009516691596222152,
"angularVelocity": 0.00023666929592428788,
"velocityX": 0.8365591058784542,
"velocityY": 0.006590143656300914,
"timestamp": 1.1978161173288773
},
{
"x": 2.3521759510040283,
"y": 7.017032623291016,
"heading": 5.0938422434116983e-17,
"angularVelocity": 0.000122380824348686,
"velocityX": 0.4182795616143265,
"velocityY": 0.0032950915824648324,
"timestamp": 1.2755790483020464
},
{
"x": 2.3521759510040283,
"y": 7.017032623291016,
"heading": 2.5675724430541464e-17,
"angularVelocity": -4.4489652123602634e-18,
"velocityX": -3.43042618417509e-18,
"velocityY": 7.376106260350096e-18,
"timestamp": 1.3533419792752155
"heading": 9.925554069905119e-19,
"angularVelocity": -0.00003414294551807602,
"velocityX": 0.36106848640215494,
"velocityY": 0.04637676845564921,
"timestamp": 1.0151414302623325
},
{
"x": 1.7625242471694946,
"y": 7.0123291015625,
"heading": 4.930172708842328e-19,
"angularVelocity": -9.633639100834258e-20,
"velocityX": -4.2792851430038895e-18,
"velocityY": -3.4270302349667407e-18,
"timestamp": 1.0828175256131547
}
]
}
Loading

0 comments on commit e63e371

Please sign in to comment.