Skip to content

Commit c8248b4

Browse files
authored
Merge pull request #49 from strykeforce/autonSpeedUp
Auton speed up
2 parents ca2b26c + b5d71de commit c8248b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4456
-3499
lines changed

src/main/deploy/choreo/2025-project.chor

Lines changed: 67 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,24 @@
1010
"exp":"9.408839",
1111
"val":9.408839
1212
}
13+
},
14+
"maxAccel":{
15+
"dimension":"LinAcc",
16+
"var":{
17+
"exp":"3 m / s ^ 2",
18+
"val":3.0
19+
}
1320
}
1421
},
1522
"poses":{
1623
"A":{
1724
"x":{
18-
"exp":"3.2654999999999994 m",
19-
"val":3.2654999999999994
25+
"exp":"3.1513229999999997 m",
26+
"val":3.1513229999999997
2027
},
2128
"y":{
22-
"exp":"4.3359 m",
23-
"val":4.3359
29+
"exp":"4.3309 m",
30+
"val":4.3309
2431
},
2532
"heading":{
2633
"exp":"0 deg",
@@ -29,8 +36,8 @@
2936
},
3037
"B":{
3138
"x":{
32-
"exp":"3.2654999999999994 m",
33-
"val":3.2654999999999994
39+
"exp":"3.1513229999999997 m",
40+
"val":3.1513229999999997
3441
},
3542
"y":{
3643
"exp":"4.0009 m",
@@ -43,12 +50,12 @@
4350
},
4451
"C":{
4552
"x":{
46-
"exp":"3.6132737518457456 m",
47-
"val":3.6132737518457456
53+
"exp":"3.5561852518457457 m",
54+
"val":3.5561852518457457
4855
},
4956
"y":{
50-
"exp":"3.1185381922643174 m",
51-
"val":3.1185381922643174
57+
"exp":"3.0196580097364216 m",
58+
"val":3.0196580097364216
5259
},
5360
"heading":{
5461
"exp":"60 deg",
@@ -57,12 +64,12 @@
5764
},
5865
"D":{
5966
"x":{
60-
"exp":"3.89906213509461 m",
61-
"val":3.89906213509461
67+
"exp":"3.84197363509461 m",
68+
"val":3.84197363509461
6269
},
6370
"y":{
64-
"exp":"2.953538192264317 m",
65-
"val":2.953538192264317
71+
"exp":"2.854658009736421 m",
72+
"val":2.854658009736421
6673
},
6774
"heading":{
6875
"exp":"60 deg",
@@ -71,12 +78,12 @@
7178
},
7279
"E":{
7380
"x":{
74-
"exp":"4.837096751845746 m",
75-
"val":4.837096751845746
81+
"exp":"4.894185251845 m",
82+
"val":4.894185251845
7683
},
7784
"y":{
78-
"exp":"2.813538192264317 m",
79-
"val":2.813538192264317
85+
"exp":"2.7146580097364 m",
86+
"val":2.7146580097364
8087
},
8188
"heading":{
8289
"exp":"120 deg",
@@ -85,12 +92,12 @@
8592
},
8693
"F":{
8794
"x":{
88-
"exp":"5.122885135094611 m",
89-
"val":5.122885135094611
95+
"exp":"5.179973635094 m",
96+
"val":5.179973635094
9097
},
9198
"y":{
92-
"exp":"2.978538192264317 m",
93-
"val":2.978538192264317
99+
"exp":"2.8796580097364215 m",
100+
"val":2.8796580097364215
94101
},
95102
"heading":{
96103
"exp":"120 deg",
@@ -99,8 +106,8 @@
99106
},
100107
"G":{
101108
"x":{
102-
"exp":"5.713146 m",
103-
"val":5.713146
109+
"exp":"5.827323 m",
110+
"val":5.827323
104111
},
105112
"y":{
106113
"exp":"3.7209 m",
@@ -113,8 +120,8 @@
113120
},
114121
"H":{
115122
"x":{
116-
"exp":"5.713146 m",
117-
"val":5.713146
123+
"exp":"5.827323 m",
124+
"val":5.827323
118125
},
119126
"y":{
120127
"exp":"4.0509 m",
@@ -127,12 +134,12 @@
127134
},
128135
"I":{
129136
"x":{
130-
"exp":"5.365372248154253 m",
131-
"val":5.365372248154253
137+
"exp":"5.422460748154253 m",
138+
"val":5.422460748154253
132139
},
133140
"y":{
134-
"exp":"4.933261807735684 m",
135-
"val":4.933261807735684
141+
"exp":"5.032141990263579 m",
142+
"val":5.032141990263579
136143
},
137144
"heading":{
138145
"exp":"240 deg",
@@ -141,12 +148,12 @@
141148
},
142149
"J":{
143150
"x":{
144-
"exp":"5.079583864905389 m",
145-
"val":5.079583864905389
151+
"exp":"5.1366723649053885 m",
152+
"val":5.1366723649053885
146153
},
147154
"y":{
148-
"exp":"5.098261807735684 m",
149-
"val":5.098261807735684
155+
"exp":"5.197141990263579 m",
156+
"val":5.197141990263579
150157
},
151158
"heading":{
152159
"exp":"240 deg",
@@ -155,12 +162,12 @@
155162
},
156163
"K":{
157164
"x":{
158-
"exp":"4.141549248154255 m",
159-
"val":4.141549248154255
165+
"exp":"4.084460748154255 m",
166+
"val":4.084460748154255
160167
},
161168
"y":{
162-
"exp":"5.238261807735684 m",
163-
"val":5.238261807735684
169+
"exp":"5.3371419902635795 m",
170+
"val":5.3371419902635795
164171
},
165172
"heading":{
166173
"exp":"300 deg",
@@ -169,12 +176,12 @@
169176
},
170177
"L":{
171178
"x":{
172-
"exp":"3.85576086490539 m",
173-
"val":3.85576086490539
179+
"exp":"3.798672364905389 m",
180+
"val":3.798672364905389
174181
},
175182
"y":{
176-
"exp":"5.073261807735684 m",
177-
"val":5.073261807735684
183+
"exp":"5.1721419902635795 m",
184+
"val":5.1721419902635795
178185
},
179186
"heading":{
180187
"exp":"300 deg",
@@ -209,6 +216,20 @@
209216
"val":-0.942477796076938
210217
}
211218
},
219+
"fetchD":{
220+
"x":{
221+
"exp":"0.8522834777832031 m",
222+
"val":0.8522834777832031
223+
},
224+
"y":{
225+
"exp":"6.600111961364 m",
226+
"val":6.600111961364
227+
},
228+
"heading":{
229+
"exp":"fetch.heading",
230+
"val":-0.942477796076938
231+
}
232+
},
212233
"fetchP":{
213234
"x":{
214235
"exp":"1.69577419757843 m",
@@ -257,8 +278,8 @@
257278
"val":7.1008875
258279
},
259280
"y":{
260-
"exp":"142.621161 in",
261-
"val":3.6225774894
281+
"exp":"G.y",
282+
"val":3.7209
262283
},
263284
"heading":{
264285
"exp":"180 deg",
@@ -271,8 +292,8 @@
271292
"val":7.1008875
272293
},
273294
"y":{
274-
"exp":"155.561161 in",
275-
"val":3.9512534894
295+
"exp":"H.y",
296+
"val":4.0509
276297
},
277298
"heading":{
278299
"exp":"180 deg",

0 commit comments

Comments
 (0)