Skip to content

Commit a4f1c07

Browse files
authored
Merge pull request #287 from thedropbears/increase_path_accel
increase path acceleration and parametrise reef radius
2 parents cb8dc6f + b75e3c2 commit a4f1c07

18 files changed

+2311
-3041
lines changed

deploy/choreo/AlgaeABToShoot.traj

Lines changed: 171 additions & 221 deletions
Large diffs are not rendered by default.

deploy/choreo/AlgaeCDToShoot.traj

Lines changed: 216 additions & 267 deletions
Large diffs are not rendered by default.

deploy/choreo/AlgaeEFToShoot.traj

Lines changed: 140 additions & 189 deletions
Large diffs are not rendered by default.

deploy/choreo/AlgaeGHToShoot.traj

Lines changed: 86 additions & 122 deletions
Large diffs are not rendered by default.

deploy/choreo/AlgaeIJToShoot.traj

Lines changed: 92 additions & 125 deletions
Large diffs are not rendered by default.

deploy/choreo/AlgaeKLToShoot.traj

Lines changed: 132 additions & 169 deletions
Large diffs are not rendered by default.

deploy/choreo/BranchCToAlgaeCD.traj

Lines changed: 74 additions & 100 deletions
Large diffs are not rendered by default.

deploy/choreo/Coral.chor

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"MaxAcceleration":{
88
"dimension":"LinAcc",
99
"var":{
10-
"exp":"1 m / s ^ 2",
11-
"val":1.0
10+
"exp":"3 m / s ^ 2",
11+
"val":3.0
1212
}
1313
},
1414
"MaxVelocity":{
@@ -71,12 +71,12 @@
7171
},
7272
"AlgaeCD":{
7373
"x":{
74-
"exp":"3.7820346355438232 m",
75-
"val":3.7820346355438232
74+
"exp":"3.80368527064 m",
75+
"val":3.80368527064
7676
},
7777
"y":{
78-
"exp":"2.861191987991333 m",
79-
"val":2.861191987991333
78+
"exp":"2.89119198799 m",
79+
"val":2.89119198799
8080
},
8181
"heading":{
8282
"exp":"240 deg",
@@ -86,11 +86,11 @@
8686
"AlgaeCDRetreat":{
8787
"x":{
8888
"exp":"AlgaeCD.x - RetreatDistance * cos60 m",
89-
"val":3.582034635543823
89+
"val":3.60368527064
9090
},
9191
"y":{
9292
"exp":"AlgaeCD.y - RetreatDistance * sin60 m",
93-
"val":2.514781826479333
93+
"val":2.544781826478
9494
},
9595
"heading":{
9696
"exp":"AlgaeCD.heading",
@@ -100,11 +100,11 @@
100100
"AlgaeEF":{
101101
"x":{
102102
"exp":"Reef.x * 2 - AlgaeCD.x",
103-
"val":5.199965364456176
103+
"val":5.178314729359999
104104
},
105105
"y":{
106106
"exp":"AlgaeCD.y",
107-
"val":2.861191987991333
107+
"val":2.89119198799
108108
},
109109
"heading":{
110110
"exp":"540 deg - AlgaeCD.heading",
@@ -114,11 +114,11 @@
114114
"AlgaeEFRetreat":{
115115
"x":{
116116
"exp":"Reef.x * 2 - AlgaeCDRetreat.x",
117-
"val":5.399965364456176
117+
"val":5.3783147293599995
118118
},
119119
"y":{
120120
"exp":"AlgaeCDRetreat.y",
121-
"val":2.514781826479333
121+
"val":2.544781826478
122122
},
123123
"heading":{
124124
"exp":"AlgaeEF.heading",
@@ -156,11 +156,11 @@
156156
"AlgaeIJ":{
157157
"x":{
158158
"exp":"AlgaeEF.x",
159-
"val":5.199965364456176
159+
"val":5.178314729359999
160160
},
161161
"y":{
162162
"exp":"Reef.y * 2 - AlgaeEF.y",
163-
"val":5.190808012008667
163+
"val":5.1608080120099995
164164
},
165165
"heading":{
166166
"exp":"360 deg - AlgaeEF.heading",
@@ -170,11 +170,11 @@
170170
"AlgaeIJRetreat":{
171171
"x":{
172172
"exp":"AlgaeEFRetreat.x",
173-
"val":5.399965364456176
173+
"val":5.3783147293599995
174174
},
175175
"y":{
176176
"exp":"Reef.y * 2 - AlgaeEFRetreat.y",
177-
"val":5.5372181735206665
177+
"val":5.507218173521999
178178
},
179179
"heading":{
180180
"exp":"AlgaeIJ.heading",
@@ -184,11 +184,11 @@
184184
"AlgaeKL":{
185185
"x":{
186186
"exp":"AlgaeCD.x",
187-
"val":3.7820346355438232
187+
"val":3.80368527064
188188
},
189189
"y":{
190190
"exp":"Reef.y * 2 - AlgaeCD.y",
191-
"val":5.190808012008667
191+
"val":5.1608080120099995
192192
},
193193
"heading":{
194194
"exp":"360 deg - AlgaeCD.heading",
@@ -198,11 +198,11 @@
198198
"AlgaeKLRetreat":{
199199
"x":{
200200
"exp":"AlgaeCDRetreat.x",
201-
"val":3.582034635543823
201+
"val":3.60368527064
202202
},
203203
"y":{
204204
"exp":"Reef.y * 2 - AlgaeCDRetreat.y",
205-
"val":5.5372181735206665
205+
"val":5.507218173521999
206206
},
207207
"heading":{
208208
"exp":"AlgaeKL.heading",

deploy/choreo/ShootToAlgaeAB.traj

Lines changed: 171 additions & 234 deletions
Large diffs are not rendered by default.

deploy/choreo/ShootToAlgaeCD.traj

Lines changed: 245 additions & 310 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)