Skip to content

Commit

Permalink
Merge pull request #151 from Robocubs/amp-assist
Browse files Browse the repository at this point in the history
  • Loading branch information
@danjburke12
danjburke12 authored Aug 6, 2024
2 parents ada4912 + f8e9670 commit b2c5094
Show file tree
Hide file tree
Showing 68 changed files with 59,591 additions and 42,537 deletions.
33,550 changes: 20,606 additions & 12,944 deletions choreo.chor
View file

Large diffs are not rendered by default.

1,288 changes: 644 additions & 644 deletions src/main/deploy/choreo/AmpDrop123Amp.1.traj
View file

Large diffs are not rendered by default.

558 changes: 279 additions & 279 deletions src/main/deploy/choreo/AmpDrop123Amp.2.traj
View file

Large diffs are not rendered by default.

577 changes: 278 additions & 299 deletions src/main/deploy/choreo/AmpDrop123Amp.3.traj
View file

Large diffs are not rendered by default.

558 changes: 279 additions & 279 deletions src/main/deploy/choreo/AmpDrop123Amp.4.traj
View file

Large diffs are not rendered by default.

1,153 changes: 587 additions & 566 deletions src/main/deploy/choreo/AmpDrop123Amp.5.traj
View file

Large diffs are not rendered by default.

1,407 changes: 488 additions & 919 deletions src/main/deploy/choreo/AmpDrop123Amp.6.traj
View file

Large diffs are not rendered by default.

456 changes: 0 additions & 456 deletions src/main/deploy/choreo/AmpDrop123Amp.7.traj
View file

This file was deleted.

5,815 changes: 2,477 additions & 3,338 deletions src/main/deploy/choreo/AmpDrop123Amp.traj
View file

Large diffs are not rendered by default.

1,065 changes: 1,065 additions & 0 deletions src/main/deploy/choreo/AmpDrop21Amp.1.traj
View file

Large diffs are not rendered by default.

404 changes: 404 additions & 0 deletions src/main/deploy/choreo/AmpDrop21Amp.2.traj
View file

Large diffs are not rendered by default.

372 changes: 372 additions & 0 deletions src/main/deploy/choreo/AmpDrop21Amp.3.traj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,372 @@
{
"samples": [
{
"x": 4.94913911819458,
"y": 6.549923419952393,
"heading": 3.3558821008990547,
"angularVelocity": -1.0324697025451037e-26,
"velocityX": 6.955888403395369e-25,
"velocityY": -3.1880249597002326e-26,
"moduleForcesX": [
101.86794339433095,
102.8097902949682,
98.36267506588354,
100.33336575763524
],
"moduleForcesY": [
-20.282432345399112,
-14.836130253301933,
-33.37717805926361,
-26.90219886162011
],
"timestamp": 0
},
{
"x": 4.997561362195222,
"y": 6.56236929503381,
"heading": 3.3580294153969588,
"angularVelocity": 0.022741675447465956,
"velocityX": 0.5128279805196355,
"velocityY": 0.13181117718787685,
"moduleForcesX": [
101.00367963180625,
100.98747797376593,
100.2210117584389,
100.17696976221879
],
"moduleForcesY": [
24.27609434521853,
24.337230769691583,
27.328207644579606,
27.483764085860404
],
"timestamp": 0.09442200082682106
},
{
"x": 5.094402487566484,
"y": 6.58726018099999,
"heading": 3.3623232462914845,
"angularVelocity": 0.04547489840213213,
"velocityX": 1.0256203482584172,
"velocityY": 0.2636132018832288,
"moduleForcesX": [
100.99507007587597,
100.98187326548671,
100.21243497671352,
100.1718173324192
],
"moduleForcesY": [
24.28148025815985,
24.32918201260933,
27.33262777214958,
27.474825323011604
],
"timestamp": 0.18884400165364212
},
{
"x": 5.239657908297333,
"y": 6.624594899253353,
"heading": 3.3687624997000847,
"angularVelocity": 0.06819653631795572,
"velocityX": 1.5383641466914133,
"velocityY": 0.3954027443438584,
"moduleForcesX": [
100.98310689093796,
100.97444023713807,
100.20049900918066,
100.16503973396492
],
"moduleForcesY": [
24.289750285938986,
24.317336728354494,
27.33952048880928,
27.461713709865858
],
"timestamp": 0.2832660024804632
},
{
"x": 5.433320999016378,
"y": 6.674371747073187,
"heading": 3.3773455945642312,
"angularVelocity": 0.09090142963490998,
"velocityX": 2.0510377774586765,
"velocityY": 0.5271742537115821,
"moduleForcesX": [
100.96606765541829,
100.96339616368863,
100.18359207061991,
100.1549731053465
],
"moduleForcesY": [
24.30068536998697,
24.301499709099065,
27.34822771447437,
27.44375880003125
],
"timestamp": 0.37768800330728425
},
{
"x": 5.6753813460925535,
"y": 6.736588048114951,
"heading": 3.388070065750567,
"angularVelocity": 0.1135802153356784,
"velocityX": 2.5636011200412474,
"velocityY": 0.6589174185778454,
"moduleForcesX": [
100.94027563862852,
100.9449370469766,
100.15824469251238,
100.1380342801103
],
"moduleForcesY": [
24.313756902151955,
24.281187523456158,
27.357396961277995,
27.419589767464966
],
"timestamp": 0.4721100041341053
},
{
"x": 5.965820199412217,
"y": 6.811238983429394,
"heading": 3.400931585275502,
"angularVelocity": 0.1362131644353108,
"velocityX": 3.0759658848191034,
"velocityY": 0.7906095471473797,
"moduleForcesX": [
100.89620564782764,
100.90921326170522,
100.11539543725922,
100.10486375421135
],
"moduleForcesY": [
24.327445385099157,
24.254977320282695,
27.36365967796714,
27.385803273710575
],
"timestamp": 0.5665320049609264
},
{
"x": 6.3045937919459725,
"y": 6.898313304270403,
"heading": 3.415920697441013,
"angularVelocity": 0.15874597058160403,
"velocityX": 3.5878671238401014,
"velocityY": 0.9221825430358215,
"moduleForcesX": [
100.7990384058165,
100.8202456502269,
100.02167913927708,
100.02101062793308
],
"moduleForcesY": [
24.335720224174956,
24.217102997637618,
27.355161272466592,
27.330424014871838
],
"timestamp": 0.6609540057877474
},
{
"x": 6.691483273811164,
"y": 6.9977547622688085,
"heading": 3.4329988924831305,
"angularVelocity": 0.18087092936571678,
"velocityX": 4.097450578014987,
"velocityY": 1.053159826392482,
"moduleForcesX": [
100.33657480312152,
100.3558731337677,
99.57547718987396,
99.57540485423785
],
"moduleForcesY": [
24.279783648847435,
24.11014227495784,
27.230405070232184,
27.150653228733326
],
"timestamp": 0.7553760066145685
},
{
"x": 7.030256865528316,
"y": 7.084829087726677,
"heading": 3.4479878847693777,
"angularVelocity": 0.15874470097004678,
"velocityX": 3.5878671151916586,
"velocityY": 0.9221825919318379,
"moduleForcesX": [
-100.3310440776675,
-100.36120224458178,
-99.5694632661145,
-99.58162717861475
],
"moduleForcesY": [
-24.303242184139528,
-24.088687992475226,
-27.251792357724263,
-27.12722332229975
],
"timestamp": 0.8497980074413896
},
{
"x": 7.320695717894846,
"y": 7.15948002868121,
"heading": 3.4608492610855106,
"angularVelocity": 0.1362116477463965,
"velocityX": 3.0759658747247007,
"velocityY": 0.7906096068801738,
"moduleForcesX": [
-100.78178438931633,
-100.83619332440045,
-100.00355531539111,
-100.04044192871459
],
"moduleForcesY": [
-24.407698203776647,
-24.151366823219675,
-27.42073567156444,
-27.258599307541015
],
"timestamp": 0.9442200082682106
},
{
"x": 7.562756064024109,
"y": 7.221696335382297,
"heading": 3.471573592534646,
"angularVelocity": 0.11357873541363424,
"velocityX": 2.563601110012737,
"velocityY": 0.6589174785143318,
"moduleForcesX": [
-100.86889948309182,
-100.93436018644147,
-100.08679065360312,
-100.13562772616494
],
"moduleForcesY": [
-24.441008200031767,
-24.15083097166975,
-27.467527397797447,
-27.27251892773385
],
"timestamp": 1.0386420090950317
},
{
"x": 7.756419153885319,
"y": 7.271473188304767,
"heading": 3.4801565654784543,
"angularVelocity": 0.09090013840683318,
"velocityX": 2.0510377683735532,
"velocityY": 0.527174307752334,
"moduleForcesX": [
-100.90462179403079,
-100.97780983316274,
-100.12084939130514,
-100.17820989950272
],
"moduleForcesY": [
-24.461854025504017,
-24.144779980727193,
-27.493404372045998,
-27.271897402146614
],
"timestamp": 1.1330640099218527
},
{
"x": 7.901674573908995,
"y": 7.308807910712064,
"heading": 3.486595723260891,
"angularVelocity": 0.0681955235649677,
"velocityX": 1.538364139201915,
"velocityY": 0.3954027883371402,
"moduleForcesX": [
-100.92376939701782,
-101.00250138598369,
-100.13911698085747,
-100.20263997921137
],
"moduleForcesY": [
-24.476271773306955,
-24.139067133242285,
-27.510140735297238,
-27.26869983546636
],
"timestamp": 1.2274860107486738
},
{
"x": 7.998515698772822,
"y": 7.33369879960781,
"heading": 3.490889489446965,
"angularVelocity": 0.04547421309096088,
"velocityX": 1.025620342884309,
"velocityY": 0.2636132329095449,
"moduleForcesX": [
-100.93585990525423,
-101.01827019613434,
-100.15066788553298,
-100.21828622446499
],
"moduleForcesY": [
-24.485811181491894,
-24.135172861483003,
-27.52105313940665,
-27.266294205082918
],
"timestamp": 1.3219080115754949
},
{
"x": 8.046937942504883,
"y": 7.346144676208496,
"heading": 3.4930367718795208,
"angularVelocity": 0.022741335851317438,
"velocityX": 0.512827977675161,
"velocityY": 0.1318111932780615,
"moduleForcesX": [
-100.94456055193515,
-101.02890770100564,
-100.15898249432855,
-100.22874291835545
],
"moduleForcesY": [
-24.491038596978424,
-24.1336297240758,
-27.52745036480875,
-27.26600839966406
],
"timestamp": 1.416330012402316
},
{
"x": 8.046937942504883,
"y": 7.346144676208496,
"heading": 3.4930367718795208,
"angularVelocity": -6.1290507682882316e-27,
"velocityX": -7.296826507334772e-25,
"velocityY": -1.8293962515090036e-25,
"moduleForcesX": [
-100.95158372272769,
-101.03618455244883,
-100.16568303703966,
-100.23568558210425
],
"moduleForcesY": [
-24.492212652416896,
-24.13467984448153,
-27.529948909930702,
-27.268468063642455
],
"timestamp": 1.510752013229137
}
],
"eventMarkers": [
{
"timestamp": 0.6107520132291366,
"command": {
"type": "named",
"data": {
"name": "seek1"
}
}
}
]
}
Loading

0 comments on commit b2c5094

Please sign in to comment.