Skip to content

Commit

Permalink
final comp changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@shinthebinn
shinthebinn committed Mar 17, 2024
1 parent 3a44001 commit 3b8eff6
Show file tree
Hide file tree
Showing 8 changed files with 488 additions and 528 deletions.
316 changes: 140 additions & 176 deletions choreo.chor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,12 +1429,12 @@
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": true,
"controlIntervalCount": 19
"controlIntervalCount": 15
},
{
"x": 2.8771493434906006,
"y": 5.000100135803223,
"heading": 1.5707963267948966,
"x": 4.08034610748291,
"y": 5.723013877868652,
"heading": 0,
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": true,
Expand All @@ -1446,181 +1446,145 @@
"x": 1.3126474618911743,
"y": 5.567087650299072,
"heading": 0,
"angularVelocity": 0,
"velocityX": 1.674488653195789e-33,
"velocityY": 7.11171747202546e-38,
"angularVelocity": -2.2724863650268547e-35,
"velocityX": -4.1154428429404407e-35,
"velocityY": 3.7900808159397985e-34,
"timestamp": 0
},
{
"x": 1.34929738878066,
"y": 5.5538054348907835,
"heading": 1.2355468400098194e-8,
"angularVelocity": 1.451370137183604e-7,
"velocityX": 0.4305187599139744,
"velocityY": -0.156023310052692,
"timestamp": 0.08512968609500099
},
{
"x": 1.4225972370219229,
"y": 5.527241006054132,
"heading": 4.5628523121809076e-8,
"angularVelocity": 3.908513740983071e-7,
"velocityX": 0.8610374547776837,
"velocityY": -0.31204659684762154,
"timestamp": 0.17025937219000198
},
{
"x": 1.5186402607278184,
"y": 5.492434275732478,
"heading": 0.023798969361148174,
"angularVelocity": 0.2795608068619741,
"velocityX": 1.1281966152056035,
"velocityY": -0.4088671287100916,
"timestamp": 0.25538905828500297
},
{
"x": 1.614683284388423,
"y": 5.457627545285846,
"heading": 0.08983587293589476,
"angularVelocity": 0.7757212155234814,
"velocityX": 1.1281966146735791,
"velocityY": -0.40886713017817483,
"timestamp": 0.34051874438000396
},
{
"x": 1.7107263080490587,
"y": 5.4228208148393,
"heading": 0.19002287752886737,
"angularVelocity": 1.1768750619045902,
"velocityX": 1.1281966146739437,
"velocityY": -0.4088671301771691,
"timestamp": 0.42564843047500495
},
{
"x": 1.806769331709714,
"y": 5.388014084392808,
"heading": 0.3166500634968596,
"angularVelocity": 1.4874621507082946,
"velocityX": 1.1281966146741744,
"velocityY": -0.40886713017653226,
"timestamp": 0.5107781165700059
},
{
"x": 1.902812355370287,
"y": 5.35320735394609,
"heading": 0.46249608510530194,
"angularVelocity": 1.7132216539091256,
"velocityX": 1.1281966146732083,
"velocityY": -0.4088671301791978,
"timestamp": 0.5959078026650069
},
{
"x": 1.9988553790306578,
"y": 5.318400623498813,
"heading": 0.6208292331181784,
"angularVelocity": 1.8599052254954127,
"velocityX": 1.1281966146708353,
"velocityY": -0.408867130185746,
"timestamp": 0.6810374887600079
},
{
"x": 2.094898402690861,
"y": 5.283593893051074,
"heading": 0.7853048024978768,
"angularVelocity": 1.9320589200358482,
"velocityX": 1.1281966146688651,
"velocityY": -0.40886713019118176,
"timestamp": 0.766167174855009
},
{
"x": 2.1909414263511025,
"y": 5.248787162603439,
"heading": 0.9497879513318085,
"angularVelocity": 1.9321479542444888,
"velocityX": 1.1281966146693132,
"velocityY": -0.40886713018994547,
"timestamp": 0.85129686095001
},
{
"x": 2.286984450011549,
"y": 5.213980432156372,
"heading": 1.108141013047214,
"angularVelocity": 1.8601391474495799,
"velocityX": 1.128196614671724,
"velocityY": -0.4088671301832935,
"timestamp": 0.936426547045011
},
{
"x": 2.383027473672174,
"y": 5.1791737017097965,
"heading": 1.254013432652853,
"angularVelocity": 1.7135317454695138,
"velocityX": 1.1281966146738198,
"velocityY": -0.40886713017751036,
"timestamp": 1.021556233140012
},
{
"x": 2.479070497332845,
"y": 5.144366971263349,
"heading": 1.3806693463444173,
"angularVelocity": 1.4877996090602523,
"velocityX": 1.1281966146743598,
"velocityY": -0.4088671301760209,
"timestamp": 1.1066859192350131
},
{
"x": 2.5751135209934812,
"y": 5.109560240816806,
"heading": 1.4808868727958657,
"angularVelocity": 1.1772335955709967,
"velocityX": 1.128196614673956,
"velocityY": -0.40886713017713466,
"timestamp": 1.1918156053300142
},
{
"x": 2.6711565446540857,
"y": 5.074753510370173,
"heading": 1.5469577993154264,
"angularVelocity": 0.776120875693452,
"velocityX": 1.1281966146735771,
"velocityY": -0.4088671301781801,
"timestamp": 1.2769452914250152
},
{
"x": 2.7671995683594357,
"y": 5.039946780047014,
"heading": 1.5707962811320204,
"angularVelocity": 0.2800254871137584,
"velocityX": 1.1281966151991965,
"velocityY": -0.4088671287277703,
"timestamp": 1.3620749775200163
},
{
"x": 2.840499416601011,
"y": 5.0133823512112246,
"heading": 1.5707963144274508,
"angularVelocity": 3.911142169044648e-7,
"velocityX": 0.8610374547813509,
"velocityY": -0.3120465968375025,
"timestamp": 1.4472046636150173
},
{
"x": 2.8771493434906006,
"y": 5.000100135803223,
"heading": 1.5707963267948966,
"angularVelocity": 1.4527771000322412e-7,
"velocityX": 0.4305187599151969,
"velocityY": -0.15602331004931888,
"timestamp": 1.5323343497100184
},
{
"x": 2.8771493434906006,
"y": 5.000100135803223,
"heading": 1.5707963267948966,
"angularVelocity": 1.8805605259344148e-32,
"velocityX": 2.677429684849837e-34,
"x": 1.3974808890848593,
"y": 5.5718669843118915,
"heading": 1.6886831292584428e-23,
"angularVelocity": 1.343613746238813e-22,
"velocityX": 0.6749835686447176,
"velocityY": 0.038027131927045286,
"timestamp": 0.1256822108485099
},
{
"x": 1.56714773476128,
"y": 5.581425651846773,
"heading": 1.4046959840458008e-22,
"angularVelocity": 9.832970942125023e-22,
"velocityX": 1.34996706798011,
"velocityY": 0.07605425994935128,
"timestamp": 0.2513644216970198
},
{
"x": 1.793017544746431,
"y": 5.594150674294191,
"heading": -3.995232059088626e-18,
"angularVelocity": -3.1789483061159005e-17,
"velocityX": 1.797150196994875,
"velocityY": 0.10124760188023336,
"timestamp": 0.37704663254552967
},
{
"x": 2.018887354731584,
"y": 5.606875696741609,
"heading": -6.336394833696792e-18,
"angularVelocity": -1.862763831462549e-17,
"velocityX": 1.79715019699489,
"velocityY": 0.10124760188023418,
"timestamp": 0.5027288433940396
},
{
"x": 2.2447571647167366,
"y": 5.619600719189027,
"heading": -7.40929128523623e-18,
"angularVelocity": -8.53658157126495e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.10124760188023423,
"timestamp": 0.6284110542425494
},
{
"x": 2.470626974701889,
"y": 5.6323257416364445,
"heading": -7.546116554341213e-18,
"angularVelocity": -1.0886605307842563e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.1012476018802342,
"timestamp": 0.7540932650910592
},
{
"x": 2.6964967846870422,
"y": 5.645050764083862,
"heading": -7.077194412954045e-18,
"angularVelocity": 3.731014474233488e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.1012476018802342,
"timestamp": 0.8797754759395691
},
{
"x": 2.922366594672195,
"y": 5.65777578653128,
"heading": -6.335427536393661e-18,
"angularVelocity": 5.901924190789222e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.1012476018802342,
"timestamp": 1.005457686788079
},
{
"x": 3.148236404657348,
"y": 5.670500808978698,
"heading": -5.577961733214196e-18,
"angularVelocity": 6.026833854485249e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.10124760188023423,
"timestamp": 1.1311398976365887
},
{
"x": 3.3741062146425005,
"y": 5.683225831426116,
"heading": -4.92423321292289e-18,
"angularVelocity": 5.201440295839972e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.10124760188023421,
"timestamp": 1.2568221084850986
},
{
"x": 3.5999760246276535,
"y": 5.6959508538735335,
"heading": -4.343100343450651e-18,
"angularVelocity": 4.623827478949564e-18,
"velocityX": 1.79715019699489,
"velocityY": 0.10124760188023418,
"timestamp": 1.3825043193336084
},
{
"x": 3.8258458346128044,
"y": 5.708675876320951,
"heading": -5.8736919683700795e-18,
"angularVelocity": -1.217826792536569e-17,
"velocityX": 1.797150196994875,
"velocityY": 0.10124760188023336,
"timestamp": 1.5081865301821182
},
{
"x": 3.995512680289225,
"y": 5.718234543855833,
"heading": 2.728574226956978e-22,
"angularVelocity": 4.6736644461091284e-17,
"velocityX": 1.34996706798011,
"velocityY": 0.07605425994935128,
"timestamp": 1.633868741030628
},
{
"x": 4.08034610748291,
"y": 5.723013877868652,
"heading": -2.4781811920112445e-36,
"angularVelocity": -2.171010658203156e-21,
"velocityX": 0.6749835686447176,
"velocityY": 0.03802713192704529,
"timestamp": 1.759550951879138
},
{
"x": 4.08034610748291,
"y": 5.723013877868652,
"heading": -1.5575812221940043e-36,
"angularVelocity": 7.324824341726948e-36,
"velocityX": -1.625065332502054e-34,
"velocityY": 0,
"timestamp": 1.6174640358050194
"timestamp": 1.8852331627276477
}
],
"constraints": [
Expand All @@ -1642,7 +1606,7 @@
"last"
],
"type": "MaxVelocity",
"velocity": 1.2
"velocity": 1.8
}
],
"usesControlIntervalGuessing": true,
Expand Down
Loading

0 comments on commit 3b8eff6

Please sign in to comment.