Skip to content

Commit

Permalink
Merge pull request #11 from MillenniumFalcons/competition
Browse files Browse the repository at this point in the history 
Competition
  • Loading branch information
@eshen7
eshen7 authored Apr 12, 2024
2 parents 260c36a + 5c10ee3 commit 0a07b96
Show file tree
Hide file tree
Showing 32 changed files with 5,599 additions and 3,609 deletions.
3,206 changes: 1,958 additions & 1,248 deletions choreo.chor
View file

Large diffs are not rendered by default.

157 changes: 83 additions & 74 deletions src/main/deploy/choreo/f1 to shoot1.1.traj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,110 @@
{
"x": 7.961704730987549,
"y": 7.241039276123047,
"heading": 2.765487716765337e-32,
"angularVelocity": 4.8328149508225337e-33,
"velocityX": -6.555021002693054e-19,
"velocityY": -1.5459679670217603e-19,
"heading": 1.485928976010559e-33,
"angularVelocity": 6.980657928808262e-33,
"velocityX": -5.152780996612145e-19,
"velocityY": -1.1092866556313531e-19,
"timestamp": 0
},
{
"x": 7.853125471386438,
"y": 7.217394396367732,
"heading": 4.286820247152187e-18,
"angularVelocity": 4.1641572750148025e-17,
"velocityX": -1.054723805025753,
"velocityY": -0.22968306872344443,
"timestamp": 0.10294568026599142
"x": 7.847946034807564,
"y": 7.216664682583884,
"heading": -1.551955782424883e-19,
"angularVelocity": -1.473361443864596e-18,
"velocityX": -1.0799769436043434,
"velocityY": -0.23140208103628496,
"timestamp": 0.10533437482500667
},
{
"x": 7.63596696587304,
"y": 7.170104639838066,
"heading": 9.949484103828978e-18,
"angularVelocity": 5.500632579241458e-17,
"velocityX": -2.1094474770802503,
"velocityY": -0.45936610849021686,
"timestamp": 0.20589136053198284
"x": 7.62042865637122,
"y": 7.167915498488991,
"heading": -3.0717360519310644e-19,
"angularVelocity": -1.4428153755449963e-18,
"velocityX": -2.159953755022008,
"velocityY": -0.46280413374949037,
"timestamp": 0.21066874965001334
},
{
"x": 7.334202211689266,
"y": 7.104390512174401,
"heading": 6.251060181311701e-17,
"angularVelocity": 5.105713753664092e-16,
"velocityX": -2.9313007928452617,
"velocityY": -0.638337883570051,
"timestamp": 0.30883704079797425
"x": 7.311438782236307,
"y": 7.101709548151352,
"heading": 6.059567281233803e-19,
"angularVelocity": 8.668873471827671e-18,
"velocityX": -2.9334191677544825,
"velocityY": -0.6285312885520219,
"timestamp": 0.31600312447502
},
{
"x": 7.032437457505674,
"y": 7.038676384510602,
"heading": 1.1910730953597e-16,
"angularVelocity": 5.497725359542594e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711457,
"timestamp": 0.4117827210639657
"x": 7.002448908101181,
"y": 7.0355035978137925,
"heading": 6.4022807893233525e-18,
"angularVelocity": 5.502784905922224e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520328,
"timestamp": 0.4213374993000267
},
{
"x": 6.730672703321988,
"y": 6.9729622568468255,
"heading": 1.6088691212942026e-16,
"angularVelocity": 4.058412414930886e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711467,
"timestamp": 0.5147284013299571
"x": 6.693459033965966,
"y": 6.969297647476113,
"heading": 1.1161410737536098e-17,
"angularVelocity": 4.5181166800789495e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.628531288552033,
"timestamp": 0.5266718741250334
},
{
"x": 6.428907949138302,
"y": 6.907248129183026,
"heading": 1.3742459594440858e-16,
"angularVelocity": -2.2790966988825524e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711461,
"timestamp": 0.6176740815959485
"x": 6.384469159830879,
"y": 6.903091697138585,
"heading": 1.274689081942897e-17,
"angularVelocity": 1.505187732126569e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520327,
"timestamp": 0.63200624895004
},
{
"x": 6.127143194954608,
"y": 6.841534001519354,
"heading": 6.452860139076419e-18,
"angularVelocity": -1.2722411979712524e-15,
"velocityX": -2.931300792845246,
"velocityY": -0.6383378835701223,
"timestamp": 0.7206197618619399
"x": 6.075479285695905,
"y": 6.83688574680104,
"heading": 9.92962258971109e-18,
"angularVelocity": -2.6745952929396705e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520328,
"timestamp": 0.7373406237750466
},
{
"x": 5.909984689441228,
"y": 6.794244244989685,
"heading": 2.0050727484710197e-18,
"angularVelocity": -4.320518686244027e-17,
"velocityX": -2.109447477080259,
"velocityY": -0.4593661084901778,
"timestamp": 0.8235654421279313
"x": 5.766489411561166,
"y": 6.770679796463451,
"heading": 1.189364676014261e-21,
"angularVelocity": -9.425634557874209e-17,
"velocityX": -2.9334191677544825,
"velocityY": -0.6285312885520227,
"timestamp": 0.8426749986000532
},
{
"x": 5.801405429840088,
"y": 6.770599365234375,
"heading": -6.15742509474964e-32,
"angularVelocity": -1.9476996634375702e-17,
"velocityX": -1.054723805025756,
"velocityY": -0.22968306872343136,
"timestamp": 0.9265111223939226
"x": 5.538972033124143,
"y": 6.721930612368536,
"heading": 2.7582751141452645e-22,
"angularVelocity": -8.67273569435062e-21,
"velocityX": -2.159953755022009,
"velocityY": -0.4628041337494901,
"timestamp": 0.9480093734250599
},
{
"x": 5.801405429840088,
"y": 6.770599365234375,
"heading": -3.0473681255941464e-32,
"angularVelocity": 6.089504436614674e-33,
"velocityX": -3.570948477936274e-19,
"velocityY": -9.555563525958288e-20,
"timestamp": 1.029456802659914
"x": 5.42521333694458,
"y": 6.697556018829346,
"heading": -3.189137371133704e-33,
"angularVelocity": -2.6185898625602595e-21,
"velocityX": -1.079976943604345,
"velocityY": -0.23140208103628498,
"timestamp": 1.0533437482500665
},
{
"x": 5.42521333694458,
"y": 6.697556018829346,
"heading": -1.6474019774387306e-33,
"angularVelocity": -1.0031539101184212e-33,
"velocityX": -3.742296162373842e-19,
"velocityY": -8.095771521798717e-20,
"timestamp": 1.1586781230750731
}
],
"eventMarkers": []
Expand Down
157 changes: 83 additions & 74 deletions src/main/deploy/choreo/f1 to shoot1.traj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,110 @@
{
"x": 7.961704730987549,
"y": 7.241039276123047,
"heading": 2.765487716765337e-32,
"angularVelocity": 4.8328149508225337e-33,
"velocityX": -6.555021002693054e-19,
"velocityY": -1.5459679670217603e-19,
"heading": 1.485928976010559e-33,
"angularVelocity": 6.980657928808262e-33,
"velocityX": -5.152780996612145e-19,
"velocityY": -1.1092866556313531e-19,
"timestamp": 0
},
{
"x": 7.853125471386438,
"y": 7.217394396367732,
"heading": 4.286820247152187e-18,
"angularVelocity": 4.1641572750148025e-17,
"velocityX": -1.054723805025753,
"velocityY": -0.22968306872344443,
"timestamp": 0.10294568026599142
"x": 7.847946034807564,
"y": 7.216664682583884,
"heading": -1.551955782424883e-19,
"angularVelocity": -1.473361443864596e-18,
"velocityX": -1.0799769436043434,
"velocityY": -0.23140208103628496,
"timestamp": 0.10533437482500667
},
{
"x": 7.63596696587304,
"y": 7.170104639838066,
"heading": 9.949484103828978e-18,
"angularVelocity": 5.500632579241458e-17,
"velocityX": -2.1094474770802503,
"velocityY": -0.45936610849021686,
"timestamp": 0.20589136053198284
"x": 7.62042865637122,
"y": 7.167915498488991,
"heading": -3.0717360519310644e-19,
"angularVelocity": -1.4428153755449963e-18,
"velocityX": -2.159953755022008,
"velocityY": -0.46280413374949037,
"timestamp": 0.21066874965001334
},
{
"x": 7.334202211689266,
"y": 7.104390512174401,
"heading": 6.251060181311701e-17,
"angularVelocity": 5.105713753664092e-16,
"velocityX": -2.9313007928452617,
"velocityY": -0.638337883570051,
"timestamp": 0.30883704079797425
"x": 7.311438782236307,
"y": 7.101709548151352,
"heading": 6.059567281233803e-19,
"angularVelocity": 8.668873471827671e-18,
"velocityX": -2.9334191677544825,
"velocityY": -0.6285312885520219,
"timestamp": 0.31600312447502
},
{
"x": 7.032437457505674,
"y": 7.038676384510602,
"heading": 1.1910730953597e-16,
"angularVelocity": 5.497725359542594e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711457,
"timestamp": 0.4117827210639657
"x": 7.002448908101181,
"y": 7.0355035978137925,
"heading": 6.4022807893233525e-18,
"angularVelocity": 5.502784905922224e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520328,
"timestamp": 0.4213374993000267
},
{
"x": 6.730672703321988,
"y": 6.9729622568468255,
"heading": 1.6088691212942026e-16,
"angularVelocity": 4.058412414930886e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711467,
"timestamp": 0.5147284013299571
"x": 6.693459033965966,
"y": 6.969297647476113,
"heading": 1.1161410737536098e-17,
"angularVelocity": 4.5181166800789495e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.628531288552033,
"timestamp": 0.5266718741250334
},
{
"x": 6.428907949138302,
"y": 6.907248129183026,
"heading": 1.3742459594440858e-16,
"angularVelocity": -2.2790966988825524e-16,
"velocityX": -2.9313007928450685,
"velocityY": -0.6383378835711461,
"timestamp": 0.6176740815959485
"x": 6.384469159830879,
"y": 6.903091697138585,
"heading": 1.274689081942897e-17,
"angularVelocity": 1.505187732126569e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520327,
"timestamp": 0.63200624895004
},
{
"x": 6.127143194954608,
"y": 6.841534001519354,
"heading": 6.452860139076419e-18,
"angularVelocity": -1.2722411979712524e-15,
"velocityX": -2.931300792845246,
"velocityY": -0.6383378835701223,
"timestamp": 0.7206197618619399
"x": 6.075479285695905,
"y": 6.83688574680104,
"heading": 9.92962258971109e-18,
"angularVelocity": -2.6745952929396705e-17,
"velocityX": -2.9334191677545203,
"velocityY": -0.6285312885520328,
"timestamp": 0.7373406237750466
},
{
"x": 5.909984689441228,
"y": 6.794244244989685,
"heading": 2.0050727484710197e-18,
"angularVelocity": -4.320518686244027e-17,
"velocityX": -2.109447477080259,
"velocityY": -0.4593661084901778,
"timestamp": 0.8235654421279313
"x": 5.766489411561166,
"y": 6.770679796463451,
"heading": 1.189364676014261e-21,
"angularVelocity": -9.425634557874209e-17,
"velocityX": -2.9334191677544825,
"velocityY": -0.6285312885520227,
"timestamp": 0.8426749986000532
},
{
"x": 5.801405429840088,
"y": 6.770599365234375,
"heading": -6.15742509474964e-32,
"angularVelocity": -1.9476996634375702e-17,
"velocityX": -1.054723805025756,
"velocityY": -0.22968306872343136,
"timestamp": 0.9265111223939226
"x": 5.538972033124143,
"y": 6.721930612368536,
"heading": 2.7582751141452645e-22,
"angularVelocity": -8.67273569435062e-21,
"velocityX": -2.159953755022009,
"velocityY": -0.4628041337494901,
"timestamp": 0.9480093734250599
},
{
"x": 5.801405429840088,
"y": 6.770599365234375,
"heading": -3.0473681255941464e-32,
"angularVelocity": 6.089504436614674e-33,
"velocityX": -3.570948477936274e-19,
"velocityY": -9.555563525958288e-20,
"timestamp": 1.029456802659914
"x": 5.42521333694458,
"y": 6.697556018829346,
"heading": -3.189137371133704e-33,
"angularVelocity": -2.6185898625602595e-21,
"velocityX": -1.079976943604345,
"velocityY": -0.23140208103628498,
"timestamp": 1.0533437482500665
},
{
"x": 5.42521333694458,
"y": 6.697556018829346,
"heading": -1.6474019774387306e-33,
"angularVelocity": -1.0031539101184212e-33,
"velocityX": -3.742296162373842e-19,
"velocityY": -8.095771521798717e-20,
"timestamp": 1.1586781230750731
}
],
"eventMarkers": []
Expand Down
Loading

0 comments on commit 0a07b96

Please sign in to comment.