Skip to content

Commit d5315eb

Browse files
committed
2 parents 1b61cc5 + 21e8396 commit d5315eb

19 files changed

+13680
-4482
lines changed

Choreo.chor

Lines changed: 893 additions & 848 deletions
Large diffs are not rendered by default.

chor.chor

Lines changed: 8991 additions & 0 deletions
Large diffs are not rendered by default.

src/main/deploy/choreo/IntakeBottom(Side).traj

Lines changed: 231 additions & 204 deletions
Large diffs are not rendered by default.

src/main/deploy/choreo/IntakeBottom.traj

Lines changed: 197 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -3,200 +3,209 @@
33
{
44
"x": 1.45,
55
"y": 5.55,
6-
"heading": 2.768251771677101e-30,
7-
"angularVelocity": 3.753704150028592e-30,
8-
"velocityX": 1.78848438354095e-18,
9-
"velocityY": 1.274461077577e-18,
6+
"heading": -5.949075965302533e-29,
7+
"angularVelocity": -7.843194432508815e-29,
8+
"velocityX": 5.402514903146015e-19,
9+
"velocityY": 3.9915577159108426e-19,
1010
"timestamp": 0
1111
},
1212
{
13-
"x": 1.4535815159544254,
14-
"y": 5.524007481828958,
15-
"heading": -9.823289382952179e-20,
16-
"angularVelocity": -1.0697381656316235e-18,
17-
"velocityX": 0.03900204848849219,
18-
"velocityY": -0.2830537311420744,
19-
"timestamp": 0.09182891907542194
20-
},
21-
{
22-
"x": 1.4610505989891902,
23-
"y": 5.472066455928889,
24-
"heading": -2.6372924069556547e-19,
25-
"angularVelocity": -1.8022248744733155e-18,
26-
"velocityX": 0.08133693731394162,
27-
"velocityY": -0.5656281966805212,
28-
"timestamp": 0.18365783815084388
29-
},
30-
{
31-
"x": 1.4728314962474147,
32-
"y": 5.3942440380110686,
33-
"heading": -1.237796661602218e-18,
34-
"angularVelocity": -1.0607414612468509e-17,
35-
"velocityX": 0.12829179933186746,
36-
"velocityY": -0.8474717845073405,
37-
"timestamp": 0.2754867572262658
38-
},
39-
{
40-
"x": 1.4895508316112023,
41-
"y": 5.290652453052921,
42-
"heading": 9.017349016336884e-19,
43-
"angularVelocity": 2.3299103400186367e-17,
44-
"velocityX": 0.18207047988508238,
45-
"velocityY": -1.1280932630061935,
46-
"timestamp": 0.36731567630168777
47-
},
48-
{
49-
"x": 1.5122251256195887,
50-
"y": 5.161507462826687,
51-
"heading": 3.7532473257995165e-18,
52-
"angularVelocity": 3.1052443148810655e-17,
53-
"velocityX": 0.24691888173101642,
54-
"velocityY": -1.406365135584243,
55-
"timestamp": 0.4591445953771097
56-
},
57-
{
58-
"x": 1.5427732007543524,
59-
"y": 5.007333660042885,
60-
"heading": 4.963081319348206e-18,
61-
"angularVelocity": 1.317486833181533e-17,
62-
"velocityX": 0.332662906655519,
63-
"velocityY": -1.6789242902580064,
64-
"timestamp": 0.5509735144525316
65-
},
66-
{
67-
"x": 1.5859604538125973,
68-
"y": 4.83016662668056,
69-
"heading": 3.7369902588295676e-18,
70-
"angularVelocity": -1.3351904924389808e-17,
71-
"velocityX": 0.47030122419883236,
72-
"velocityY": -1.929316332439631,
73-
"timestamp": 0.6428024335279535
74-
},
75-
{
76-
"x": 1.6551996012505341,
77-
"y": 4.649879493853798,
78-
"heading": 4.2454026339170335e-18,
79-
"angularVelocity": 5.536517239702926e-18,
80-
"velocityX": 0.7540015513094512,
81-
"velocityY": -1.9632936404077395,
82-
"timestamp": 0.7346313526033754
83-
},
84-
{
85-
"x": 1.7358734935380205,
86-
"y": 4.493207693475708,
87-
"heading": 6.286624819906553e-18,
88-
"angularVelocity": 2.222853328563577e-17,
89-
"velocityX": 0.8785238147244084,
90-
"velocityY": -1.7061270235581365,
91-
"timestamp": 0.8264602716787973
92-
},
93-
{
94-
"x": 1.821714417214334,
95-
"y": 4.362260193361412,
96-
"heading": 5.80968001326458e-18,
97-
"angularVelocity": -5.193840614109149e-18,
98-
"velocityX": 0.9347918339856989,
99-
"velocityY": -1.4259941359651997,
100-
"timestamp": 0.9182891907542192
101-
},
102-
{
103-
"x": 1.910434779967122,
104-
"y": 4.25739231863962,
105-
"heading": 4.6383131324528144e-18,
106-
"angularVelocity": -1.2755968893296887e-17,
107-
"velocityX": 0.9661483947137779,
108-
"velocityY": -1.141991823251114,
109-
"timestamp": 1.0101181098296412
110-
},
111-
{
112-
"x": 2.000880418708742,
113-
"y": 4.178705764553529,
114-
"heading": 3.484037709528354e-18,
115-
"angularVelocity": -1.2569846135457474e-17,
116-
"velocityX": 0.984936332171851,
117-
"velocityY": -0.8568820680684339,
118-
"timestamp": 1.1019470289050632
119-
},
120-
{
121-
"x": 2.092359402339598,
122-
"y": 4.126236959884595,
123-
"heading": 2.3397136627308054e-18,
124-
"angularVelocity": -1.2461477510076924e-17,
125-
"velocityX": 0.9961892675275468,
126-
"velocityY": -0.5713756101896847,
127-
"timestamp": 1.1937759479804853
128-
},
129-
{
130-
"x": 2.1844115737917704,
131-
"y": 4.100000000000099,
132-
"heading": 1.2005907158708014e-18,
133-
"angularVelocity": -1.2404838513215584e-17,
134-
"velocityX": 1.0024311772210557,
135-
"velocityY": -0.2857156563340674,
136-
"timestamp": 1.2856048670559073
13+
"x": 1.451517806683802,
14+
"y": 5.525977172018574,
15+
"heading": -7.31795069027055e-19,
16+
"angularVelocity": -8.320159088029426e-18,
17+
"velocityX": 0.017256734358152986,
18+
"velocityY": -0.27312803760270743,
19+
"timestamp": 0.08795445605760004
20+
},
21+
{
22+
"x": 1.45497921150787,
23+
"y": 5.4779622118818825,
24+
"heading": -3.260992381512364e-18,
25+
"angularVelocity": -2.8755760679955105e-17,
26+
"velocityX": 0.039354513451865296,
27+
"velocityY": -0.5459070783775283,
28+
"timestamp": 0.17590891211520007
29+
},
30+
{
31+
"x": 1.4609680662377849,
32+
"y": 5.40600958382292,
33+
"heading": -6.5693775356331684e-18,
34+
"angularVelocity": -3.7614752750311165e-17,
35+
"velocityX": 0.06809040722148776,
36+
"velocityY": -0.8180668869334844,
37+
"timestamp": 0.2638633681728001
38+
},
39+
{
40+
"x": 1.4703323741911158,
41+
"y": 5.310224074698421,
42+
"heading": -3.056934316119412e-18,
43+
"angularVelocity": 3.993479511704303e-17,
44+
"velocityX": 0.1064676921793552,
45+
"velocityY": -1.0890353191629074,
46+
"timestamp": 0.35181782423040014
47+
},
48+
{
49+
"x": 1.4844087654309768,
50+
"y": 5.190833563860688,
51+
"heading": 1.7816120219209055e-18,
52+
"angularVelocity": 5.5011951556409315e-17,
53+
"velocityX": 0.16004182017378915,
54+
"velocityY": -1.3574128724022405,
55+
"timestamp": 0.4397722802880002
56+
},
57+
{
58+
"x": 1.5055784085606607,
59+
"y": 5.048441194641887,
60+
"heading": 4.291627574763006e-18,
61+
"angularVelocity": 2.8537673248145973e-17,
62+
"velocityX": 0.24068869365545992,
63+
"velocityY": -1.6189329751021788,
64+
"timestamp": 0.5277267363456002
65+
},
66+
{
67+
"x": 1.5389244471494463,
68+
"y": 4.88528503858295,
69+
"heading": 4.315236331847621e-18,
70+
"angularVelocity": 2.6842031685150337e-19,
71+
"velocityX": 0.37912847266037,
72+
"velocityY": -1.855007277312647,
73+
"timestamp": 0.6156811924032002
74+
},
75+
{
76+
"x": 1.5949542359426627,
77+
"y": 4.714076155773301,
78+
"heading": 5.002242100866463e-18,
79+
"angularVelocity": 7.810926082410187e-18,
80+
"velocityX": 0.6370318378926304,
81+
"velocityY": -1.9465629199902346,
82+
"timestamp": 0.7036356484608002
83+
},
84+
{
85+
"x": 1.669413078965612,
86+
"y": 4.55835175472179,
87+
"heading": 4.345995513286722e-18,
88+
"angularVelocity": -7.461209045946235e-18,
89+
"velocityX": 0.8465613495941435,
90+
"velocityY": -1.770511785662703,
91+
"timestamp": 0.7915901045184002
92+
},
93+
{
94+
"x": 1.755056657905579,
95+
"y": 4.42394169843475,
96+
"heading": 4.058001779557496e-18,
97+
"angularVelocity": -3.2743505429455726e-18,
98+
"velocityX": 0.9737264350073056,
99+
"velocityY": -1.528177903789464,
100+
"timestamp": 0.8795445605760002
101+
},
102+
{
103+
"x": 1.8486415271680805,
104+
"y": 4.312254663340399,
105+
"heading": 4.916057108928989e-18,
106+
"angularVelocity": 9.755677606074446e-18,
107+
"velocityX": 1.0640150989190542,
108+
"velocityY": -1.2698280462468206,
109+
"timestamp": 0.9674990166336002
110+
},
111+
{
112+
"x": 1.9484697339203323,
113+
"y": 4.2238145766814865,
114+
"heading": 5.7138980082265484e-18,
115+
"angularVelocity": 9.071068417038252e-18,
116+
"velocityX": 1.134998853120915,
117+
"velocityY": -1.0055213871257689,
118+
"timestamp": 1.0554534726912002
119+
},
120+
{
121+
"x": 2.053513994400657,
122+
"y": 4.1588732711108305,
123+
"heading": 6.290977461319185e-18,
124+
"angularVelocity": 6.561116638605756e-18,
125+
"velocityX": 1.1943028834325091,
126+
"velocityY": -0.738351511469897,
127+
"timestamp": 1.1434079287488002
128+
},
129+
{
130+
"x": 2.1630896883690065,
131+
"y": 4.117572314014091,
132+
"heading": 6.700926748003688e-18,
133+
"angularVelocity": 4.660926925599747e-18,
134+
"velocityX": 1.2458231098216048,
135+
"velocityY": -0.46957208250710364,
136+
"timestamp": 1.2313623848064001
137137
},
138138
{
139139
"x": 2.2767090797424316,
140-
"y": 4.1,
141-
"heading": -3.149908443603892e-30,
142-
"angularVelocity": -1.3074211163549053e-17,
143-
"velocityX": 1.0051028246870142,
144-
"velocityY": 8.993242339720801e-19,
145-
"timestamp": 1.3774337861313293
146-
},
147-
{
148-
"x": 2.3511393798440374,
149-
"y": 4.099999999999869,
150-
"heading": 1.3002264264519373e-21,
151-
"angularVelocity": 1.879818059738522e-20,
152-
"velocityX": 1.0760850992260855,
153-
"velocityY": -1.5351048777679467e-20,
154-
"timestamp": 1.4466014571217791
155-
},
156-
{
157-
"x": 2.410683625785678,
158-
"y": 4.100000000000077,
159-
"heading": 1.1949798510975526e-21,
160-
"angularVelocity": -1.521615128458001e-21,
161-
"velocityX": 0.8608681641102585,
162-
"velocityY": -1.535104870754249e-20,
163-
"timestamp": 1.515769128112229
164-
},
165-
{
166-
"x": 2.455341812172794,
167-
"y": 4.099999999999992,
168-
"heading": 7.380066473834956e-22,
169-
"angularVelocity": -6.606745193011693e-21,
170-
"velocityX": 0.6456511510226041,
171-
"velocityY": -1.535104870754326e-20,
172-
"timestamp": 1.5849367991026788
173-
},
174-
{
175-
"x": 2.485113937210665,
176-
"y": 4.099999999999996,
177-
"heading": 2.8113994728970013e-22,
178-
"angularVelocity": -6.605205487782831e-21,
179-
"velocityX": 0.4304341119443362,
180-
"velocityY": -1.535104870754403e-20,
181-
"timestamp": 1.6541044700931287
182-
},
183-
{
184-
"x": 2.5,
185-
"y": 4.1,
186-
"heading": 7.593583950238481e-31,
187-
"angularVelocity": -4.0646147043633575e-21,
188-
"velocityX": 0.21521705987076065,
189-
"velocityY": -1.5351049104609927e-20,
190-
"timestamp": 1.7232721410835785
191-
},
192-
{
193-
"x": 2.5,
194-
"y": 4.1,
195-
"heading": 3.769724316157637e-31,
196-
"angularVelocity": -7.826678887830059e-32,
197-
"velocityX": 8.574729652195167e-20,
198-
"velocityY": -5.117016267149893e-21,
199-
"timestamp": 1.7924398120740284
140+
"y": 4.099999999999999,
141+
"heading": 4.222853198314733e-28,
142+
"angularVelocity": -7.618632378536745e-17,
143+
"velocityX": 1.2917980107684226,
144+
"velocityY": -0.1997887861711724,
145+
"timestamp": 1.3193168408640001
146+
},
147+
{
148+
"x": 2.3690779044749966,
149+
"y": 4.0857142872068195,
150+
"heading": 1.952184474038464e-18,
151+
"angularVelocity": 2.7590147778061168e-17,
152+
"velocityX": 1.3054450696188908,
153+
"velocityY": -0.2018994329594577,
154+
"timestamp": 1.3900734179747103
155+
},
156+
{
157+
"x": 2.446051932827726,
158+
"y": 4.07380952534276,
159+
"heading": 1.8750712678815006e-18,
160+
"angularVelocity": -1.0898381997174239e-18,
161+
"velocityX": 1.0878710007681083,
162+
"velocityY": -0.16824954438890352,
163+
"timestamp": 1.4608299950854204
164+
},
165+
{
166+
"x": 2.5076311582571624,
167+
"y": 4.064285715421903,
168+
"heading": 9.252211438362834e-19,
169+
"angularVelocity": -1.342419532880338e-17,
170+
"velocityX": 0.8702968394505611,
171+
"velocityY": -0.13459964151748924,
172+
"timestamp": 1.5315865721961306
173+
},
174+
{
175+
"x": 2.5538155785835275,
176+
"y": 4.057142857800354,
177+
"heading": 1.1668838934873909e-18,
178+
"angularVelocity": 3.415410574877606e-18,
179+
"velocityX": 0.652722647310735,
180+
"velocityY": -0.10094973387911786,
181+
"timestamp": 1.6023431493068407
182+
},
183+
{
184+
"x": 2.5846051927165345,
185+
"y": 4.052380952623247,
186+
"heading": 7.610714972979239e-19,
187+
"angularVelocity": -5.735330793386041e-18,
188+
"velocityX": 0.4351484397597667,
189+
"velocityY": -0.0672998238572675,
190+
"timestamp": 1.673099726417551
191+
},
192+
{
193+
"x": 2.6000000000000005,
194+
"y": 4.050000000000001,
195+
"heading": -7.383012471284033e-28,
196+
"angularVelocity": -1.0756194078198667e-17,
197+
"velocityX": 0.21757422296211218,
198+
"velocityY": -0.03364991240532963,
199+
"timestamp": 1.743856303528261
200+
},
201+
{
202+
"x": 2.6,
203+
"y": 4.050000000000001,
204+
"heading": -3.627944412860274e-28,
205+
"angularVelocity": 1.796633592402844e-28,
206+
"velocityX": -2.7229997722483872e-18,
207+
"velocityY": -1.262868112191878e-17,
208+
"timestamp": 1.8146128806389712
200209
}
201210
],
202211
"eventMarkers": []

0 commit comments

Comments
 (0)