Added 6BallTop fully and set framework for two others

This commit is contained in:
ryan123rudder
2021-09-21 20:35:05 -06:00
parent 37632212be
commit ace6170848
49 changed files with 13250 additions and 62 deletions
+3
View File
@@ -0,0 +1,3 @@
5BallBottom1
5BallBottom2
5BallBottom3
+1 -2
View File
@@ -1,2 +1 @@
6balloffensice1
offensive2
6BallOffensive1
+1
View File
@@ -0,0 +1 @@
6BallOffensive2
-1
View File
@@ -1 +0,0 @@
6balloffinsive2
+1
View File
@@ -0,0 +1 @@
6BallTop
+3
View File
@@ -0,0 +1,3 @@
8BallMid1
8BallMid2
8BallMid3
+2
View File
@@ -0,0 +1,2 @@
2BallOffensive
LoopFrom2BallOffensive
-2
View File
@@ -1,2 +0,0 @@
2balloffensive
LoopFrom2BallOffinicne
+1 -1
View File
@@ -1,4 +1,4 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
3.014314222837373,-5.950201470630437,2.0526375,0.0,true,false,
3.014314222837373,-5.950201470630437,6.209200226381713,-0.010543725974497598,true,false,
9.714852079630681,-3.9236973383319733,1.0786231671911182,0.5229688083350879,true,false,
10.728104145779913,-4.021753989894802,0.26148440416754504,-0.32685550520942996,true,false,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
3.0541147019017925,-7.420490673945202,2.0526375,0.0,true,false,
6.286879507383446,-7.292206356267358,2.4630588994145945,-0.07697059060670508,true,false,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
6.261222643847879,-7.266549492731788,2.0526375,0.0,true,true,
5.234948102425132,-7.523118128087477,1.1802157226361594,0.0,true,true,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
5.234948102425132,-7.497461264551908,2.0526375,0.0,true,false,
6.235565780312309,-7.728373036372027,1.7198693808977157,-0.08936091432127258,true,false,
@@ -1,3 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
2.9489431217954873,-5.819459268546666,2.0526375,0.0,true,false,
10.123421461142469,-4.33226671984376,1.029594841409704,2.7292434684987374,true,false,
11.087645201510286,-3.9711441052172125,7.886707028924304,5.305602910367259,true,false,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
3.131085292508499,-0.6983924276262062,0.0,0.0,true,false,
8.134173681944393,-0.6983924276262062,1.0,0.0,true,false,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
3.1567421560440674,-4.5982356850326465,11.340333682721358,-0.025656863535568952,true,false,
9.827526675291926,-2.827912101078407,4.336009937511109,0.05131372707113746,true,false,
+4
View File
@@ -0,0 +1,4 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
9.853183538827494,-2.8022552375428385,0.8210196331381976,0.0,true,false,
9.955810992969768,-2.4687160115804456,-0.17959804474898178,0.9236470872804727,true,false,
6.004654008492193,-3.5463042800743305,-4.3616668010466775,-2.15517653698777,true,false,
+3
View File
@@ -0,0 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
6.030310872027759,-3.571961143609899,-1.3341569038495722,-0.5901078613180792,true,false,
9.878840402363064,-2.57134346572272,9.748,5.797,true,false,
+4
View File
@@ -0,0 +1,4 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
10.711761370519442,-4.00541121463433,0.5730515067139503,-1.0232686058250051,true,false,
8.452768080483303,-4.956982483832751,-0.8350630971802211,1.1508476901164277,true,false,
11.499904887113146,-4.4551011274466585,4.803721553981166,-2.115071430484244,true,false,
-4
View File
@@ -1,4 +0,0 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
10.711761370519442,-4.00541121463433,0.4412549320327308,-0.6863965609398024,true,false,
8.570857811397678,-5.247462134430163,-1.519878099223849,-0.34319828046990075,true,false,
11.708670661408203,-4.740836101355547,5.981455745332564,-2.7455862437592087,true,false,
+3 -3
View File
@@ -1,3 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
1.6396523867809052,-2.313833150808477,0.6989213425239973,-0.0061851446241063535,true,
3.1117168073181727,-2.3200182954325834,0.6494401855311471,0.0,true,
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
0.0,0.0,6.734375,0.0,true,false,
6.734375,-13.109375,0.0,-13.109375,true,false,
+3 -3
View File
@@ -1,3 +1,3 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
2.957088191715518,-2.3571291631772207,3.048,0.0,true,
4.6270772402241835,-2.3571291631772207,0.6822312697287889,-0.01423565032532359,true,
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
0.0,0.0,6.734375,0.0,true,false,
6.734375,-13.109375,0.0,-13.109375,true,false,
-3
View File
@@ -1,3 +0,0 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
3.2,-2.4,0.2,2.5,true,
5.006107200045366,-1.3,2.0,0.0,true,
-3
View File
@@ -1,3 +0,0 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
5.006,-1.3,3.048,0.0,true,
7.2,-1.3,1.0,0.0,true,
-4
View File
@@ -1,4 +0,0 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
3.2,-2.4,0.2,2.5,true,
5.0,-1.1,3.0,0.0,true,
7.2,-1.1,1.5,0.0,true,
-8
View File
@@ -1,8 +0,0 @@
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
7.2,-1.1,1.5,0.0,true,
6.981146126504424,-1.7267749571307522,-0.16656954801462032,-0.6424825423421034,true,
6.766985279057057,-2.6072139966365975,-0.1189782485818709,-0.2974456214546768,true,
6.564722256467875,-3.1783095898295777,-0.2022630225891815,-0.44021951975292284,true,
6.267276635013197,-3.880281256462616,-0.206563341919694,-0.4559320155220153,false,
5.946035363842147,-4.546559448521093,-0.14277389829824472,-0.2974456214546777,true,
5.660487567245656,-5.046268092564953,0.13087607344005825,-0.42832169489473504,true,
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+827
View File
@@ -0,0 +1,827 @@
[
{
"acceleration": 2.7,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.40710417205598864
},
"translation": {
"x": 7.786404598895046,
"y": 4.54833706583557
}
},
"time": 0.0,
"velocity": 0.0
},
{
"acceleration": 2.7,
"curvature": 0.039637796560312695,
"pose": {
"rotation": {
"radians": 0.4101372862702455
},
"translation": {
"x": 7.899456144506039,
"y": 4.597232944465645
}
},
"time": 0.3020577284490419,
"velocity": 0.8155558668124132
},
{
"acceleration": 2.6999999999999997,
"curvature": 0.04021048623552485,
"pose": {
"rotation": {
"radians": 0.4127832941632913
},
"translation": {
"x": 7.95892922197729,
"y": 4.623184938427464
}
},
"time": 0.37323535404691616,
"velocity": 1.0077354559266738
},
{
"acceleration": 2.7000000000000006,
"curvature": 0.03283954502466084,
"pose": {
"rotation": {
"radians": 0.4153114199247042
},
"translation": {
"x": 8.02153847241953,
"y": 4.65070185011019
}
},
"time": 0.43584788950784853,
"velocity": 1.1767893016711912
},
{
"acceleration": 2.7,
"curvature": 0.021583855714232898,
"pose": {
"rotation": {
"radians": 0.4172951751313857
},
"translation": {
"x": 8.087896851601624,
"y": 4.680047360081283
}
},
"time": 0.49366961881885857,
"velocity": 1.3329079708109184
},
{
"acceleration": 2.7000000000000006,
"curvature": 0.00921938397834923,
"pose": {
"rotation": {
"radians": 0.4184798228328697
},
"translation": {
"x": 8.158423834598533,
"y": 4.711370968179711
}
},
"time": 0.5485186658653043,
"velocity": 1.481000397836322
},
{
"acceleration": 2.699999999999998,
"curvature": -0.0027668545791871843,
"pose": {
"rotation": {
"radians": 0.4187340995999756
},
"translation": {
"x": 8.233361196297416,
"y": 4.744718163175428
}
},
"time": 0.6013567347022892,
"velocity": 1.6236631836961812
},
{
"acceleration": 2.6999999999999997,
"curvature": -0.013794103508354713,
"pose": {
"rotation": {
"radians": 0.4180021748634558
},
"translation": {
"x": 8.312788791903708,
"y": 4.780040592428857
}
},
"time": 0.6527026710955027,
"velocity": 1.7622972119578575
},
{
"acceleration": 2.6999999999999935,
"curvature": -0.023804357423019278,
"pose": {
"rotation": {
"radians": 0.41626678465437433
},
"translation": {
"x": 8.39664033744721,
"y": 4.8172062315503625
}
},
"time": 0.702823407671672,
"velocity": 1.8976232007135145
},
{
"acceleration": 2.6999999999999953,
"curvature": -0.03299763586191668,
"pose": {
"rotation": {
"radians": 0.413524518345129
},
"translation": {
"x": 8.484719190288175,
"y": 4.856009554059735
}
},
"time": 0.7518345498021842,
"velocity": 2.0299532844658974
},
{
"acceleration": 2.20758567376642,
"curvature": -0.04168149441830594,
"pose": {
"rotation": {
"radians": 0.4097705612807971
},
"translation": {
"x": 8.576714129623397,
"y": 4.896181701045667
}
},
"time": 0.799758353482366,
"velocity": 2.159347554402388
},
{
"acceleration": -0.13215496703011476,
"curvature": -0.050198380038244846,
"pose": {
"rotation": {
"radians": 0.40498973172420055
},
"translation": {
"x": 8.6722151369923,
"y": 4.937400650825231
}
},
"time": 0.8467976545200243,
"velocity": 2.2631908414771083
},
{
"acceleration": -0.13610108154017947,
"curvature": -0.05889823628084922,
"pose": {
"rotation": {
"radians": 0.39915130899637363
},
"translation": {
"x": 8.770729176783021,
"y": 4.979301388603358
}
},
"time": 0.8941656715031193,
"velocity": 2.2569309227544254
},
{
"acceleration": -0.14583226898985854,
"curvature": -0.06813492177743598,
"pose": {
"rotation": {
"radians": 0.3922059713827504
},
"translation": {
"x": 8.871695976738508,
"y": 5.021486076132319
}
},
"time": 0.9427207642447786,
"velocity": 2.250322522118002
},
{
"acceleration": -0.16145854779063545,
"curvature": -0.07827416651440672,
"pose": {
"rotation": {
"radians": 0.38408383774578403
},
"translation": {
"x": 8.974503808462586,
"y": 5.0635342213711985
}
},
"time": 0.9921592348417979,
"velocity": 2.24311279777545
},
{
"acceleration": -0.18343407434492182,
"curvature": -0.08970642082607505,
"pose": {
"rotation": {
"radians": 0.3746931036276141
},
"translation": {
"x": 9.078505267926074,
"y": 5.10501284814538
}
},
"time": 1.0421654748819114,
"velocity": 2.2350388628781035
},
{
"acceleration": -0.2124982187057265,
"curvature": -0.1028606782243861,
"pose": {
"rotation": {
"radians": 0.3639191397440452
},
"translation": {
"x": 9.183033055972846,
"y": 5.145486665806018
}
},
"time": 1.092420407398852,
"velocity": 2.225820395850592
},
{
"acceleration": -0.24956126316726768,
"curvature": -0.11821590092301022,
"pose": {
"rotation": {
"radians": 0.35162425736169883
},
"translation": {
"x": 9.287415758825933,
"y": 5.184528238889522
}
},
"time": 1.1426098396600621,
"velocity": 2.215155230897233
},
{
"acceleration": -0.2954755838125299,
"curvature": -0.136305309019135,
"pose": {
"rotation": {
"radians": 0.33764872331038
},
"translation": {
"x": 9.390993628593607,
"y": 5.221728156777029
}
},
"time": 1.1924326350262162,
"velocity": 2.2027213911511314
},
{
"acceleration": -0.3505873456214803,
"curvature": -0.15770521619071173,
"pose": {
"rotation": {
"radians": 0.3218141144075513
},
"translation": {
"x": 9.493134363775471,
"y": 5.256705203353889
}
},
"time": 1.2416085312676826,
"velocity": 2.1881911144996797
},
{
"acceleration": -0.4139039644860332,
"curvature": -0.1829934870011458,
"pose": {
"rotation": {
"radians": 0.30393083283133726
},
"translation": {
"x": 9.593248889768539,
"y": 5.289116526669138
}
},
"time": 1.289885315163848,
"velocity": 2.1712658849783812
},
{
"acceleration": -0.48164923690729716,
"curvature": -0.21265192265540564,
"pose": {
"rotation": {
"radians": 0.2838126575676461
},
"translation": {
"x": 9.690807139373334,
"y": 5.31866780859498
}
},
"time": 1.3370448933210095,
"velocity": 2.151746348615643
},
{
"acceleration": -0.5449499492627521,
"curvature": -0.24687132447562285,
"pose": {
"rotation": {
"radians": 0.2613026394465979
},
"translation": {
"x": 9.785353833299963,
"y": 5.345123434486266
}
},
"time": 1.3829075672512112,
"velocity": 2.1296566267146333
},
{
"acceleration": -0.5864852895446518,
"curvature": -0.28519988914840594,
"pose": {
"rotation": {
"radians": 0.2363163601895987
},
"translation": {
"x": 9.87652426067422,
"y": 5.368316662839968
}
},
"time": 1.427333540459156,
"velocity": 2.1054466948690154
},
{
"acceleration": -0.5762354848222506,
"curvature": -0.32596564545180456,
"pose": {
"rotation": {
"radians": 0.20891006365250406
},
"translation": {
"x": 9.964060059543659,
"y": 5.388159794954664
}
},
"time": 1.470220430671824,
"velocity": 2.080294164644969
},
{
"acceleration": -0.4670112235373567,
"curvature": -0.3654309434326236,
"pose": {
"rotation": {
"radians": 0.17938107171382264
},
"translation": {
"x": 10.047824997383689,
"y": 5.4046543445900115
}
},
"time": 1.5114955308004443,
"velocity": 2.0565099873112667
},
{
"acceleration": -0.19103438083869304,
"curvature": -0.39675949024242235,
"pose": {
"rotation": {
"radians": 0.14840344960093435
},
"translation": {
"x": 10.127820751603664,
"y": 5.417901207626228
}
},
"time": 1.5511021644887566,
"velocity": 2.038013244852292
},
{
"acceleration": 0.3407020316917297,
"curvature": -0.4091710363931832,
"pose": {
"rotation": {
"radians": 0.11718877152395155
},
"translation": {
"x": 10.204202690052961,
"y": 5.42811083172357
}
},
"time": 1.5889813617757889,
"velocity": 2.030777015851897
},
{
"acceleration": 1.2328341725243526,
"curvature": -0.3881434364946742,
"pose": {
"rotation": {
"radians": 0.08763585330692439
},
"translation": {
"x": 10.277295651527076,
"y": 5.4356133859818145
}
},
"time": 1.6250539252822709,
"velocity": 2.0430670115268845
},
{
"acceleration": 2.5810075546391302,
"curvature": -0.31796922946640627,
"pose": {
"rotation": {
"radians": 0.06239564111076547
},
"translation": {
"x": 10.347609726273708,
"y": 5.440868930599728
}
},
"time": 1.6592138012386082,
"velocity": 2.08518047393505
},
{
"acceleration": 2.700000000000004,
"curvature": -0.18773247538784665,
"pose": {
"rotation": {
"radians": 0.04474303642635818
},
"translation": {
"x": 10.415856036498848,
"y": 5.444477586534558
}
},
"time": 1.6913495978255588,
"velocity": 2.168123207700316
},
{
"acceleration": -0.6890742926314336,
"curvature": -1.1459664821516553e-14,
"pose": {
"rotation": {
"radians": 0.03814942087097617
},
"translation": {
"x": 10.482962516872867,
"y": 5.4471897051615
}
},
"time": 1.7217507985350815,
"velocity": 2.2502064496160274
},
{
"acceleration": -1.9852113287344277,
"curvature": -0.0974129477749445,
"pose": {
"rotation": {
"radians": 0.034828576227095856
},
"translation": {
"x": 10.549806392578715,
"y": 5.449666164821502
}
},
"time": 1.7516133845764434,
"velocity": 2.2296289092634307
},
{
"acceleration": -1.73532265621302,
"curvature": -0.1855294078793848,
"pose": {
"rotation": {
"radians": 0.025380074505612166
},
"translation": {
"x": 10.61630582951607,
"y": 5.45170118430581
}
},
"time": 1.7818599688254935,
"velocity": 2.169583047556696
},
{
"acceleration": -1.5750324421895385,
"curvature": -0.26797942199354646,
"pose": {
"rotation": {
"radians": 0.010429796101334267
},
"translation": {
"x": 10.682148078510464,
"y": 5.4529099968859045
}
},
"time": 1.8125906391492066,
"velocity": 2.116255419103344
},
{
"acceleration": -1.4320831593136807,
"curvature": -0.34727374036953873,
"pose": {
"rotation": {
"radians": -0.009542083362787302
},
"translation": {
"x": 10.747053845060357,
"y": 5.452966632830021
}
},
"time": 1.843619020766511,
"velocity": 2.0673847114274517
},
{
"acceleration": -1.3050538073632665,
"curvature": -0.5022730294800685,
"pose": {
"rotation": {
"radians": -0.06307659324176407
},
"translation": {
"x": 10.873098661948847,
"y": 5.448593492225992
}
},
"time": 1.9059704607365566,
"velocity": 1.9780922642873917
},
{
"acceleration": -1.1697304115266105,
"curvature": -0.6555372541631187,
"pose": {
"rotation": {
"radians": -0.13267078483022468
},
"translation": {
"x": 10.992828377464914,
"y": 5.437023349848103
}
},
"time": 1.968051663979235,
"velocity": 1.8970729536298416
},
{
"acceleration": -1.027227598414434,
"curvature": -0.8023444848858337,
"pose": {
"rotation": {
"radians": -0.2157952333240847
},
"translation": {
"x": 11.105087811805896,
"y": 5.417425332827685
}
},
"time": 2.0292774097048194,
"velocity": 1.8254553368862303
},
{
"acceleration": -0.9025596528447635,
"curvature": -0.869531291622933,
"pose": {
"rotation": {
"radians": -0.26148157028142366
},
"translation": {
"x": 11.158170399459207,
"y": 5.40452892512146
}
},
"time": 2.0594586876204066,
"velocity": 1.794452295255923
},
{
"acceleration": -0.7533666348889148,
"curvature": -0.9297731347041548,
"pose": {
"rotation": {
"radians": -0.3092978867370937
},
"translation": {
"x": 11.209139232156835,
"y": 5.389589501987457
}
},
"time": 2.0892808883959364,
"velocity": 1.767535980076894
},
{
"acceleration": -0.5804778468231985,
"curvature": -0.98077237560169,
"pose": {
"rotation": {
"radians": -0.35870393209395235
},
"translation": {
"x": 11.257960875682084,
"y": 5.372660351856879
}
},
"time": 2.1187000914836096,
"velocity": 1.7453725340456199
},
{
"acceleration": -0.3862663474016799,
"curvature": -1.0203422555702875,
"pose": {
"rotation": {
"radians": -0.40910721816379564
},
"translation": {
"x": 11.30462307676421,
"y": 5.35382024575595
}
},
"time": 2.147671371548175,
"velocity": 1.7285553477740292
},
{
"acceleration": -0.1741349932076558,
"curvature": -1.046643077671284,
"pose": {
"rotation": {
"radians": -0.45987819155996784
},
"translation": {
"x": 11.34913353570572,
"y": 5.333170105865728
}
},
"time": 2.176148338645892,
"velocity": 1.717555653708116
},
{
"acceleration": 0.052083719950407927,
"curvature": -1.0583820828395911,
"pose": {
"rotation": {
"radians": -0.5103707440219578
},
"translation": {
"x": 11.391518679009678,
"y": 5.310829674081943
}
},
"time": 2.2040835709491065,
"velocity": 1.7126911522207415
},
{
"acceleration": 0.28873165288430563,
"curvature": -1.0549380946211182,
"pose": {
"rotation": {
"radians": -0.5599454960790079
},
"translation": {
"x": 11.431822432007014,
"y": 5.286934180574818
}
},
"time": 2.231429706198941,
"velocity": 1.71411544067082
},
{
"acceleration": -1.297550514822076,
"curvature": -1.0363882405612528,
"pose": {
"rotation": {
"radians": -0.6079928487110259
},
"translation": {
"x": 11.470104991483813,
"y": 5.261631012348894
}
},
"time": 2.2581408852023555,
"velocity": 1.7218278035349643
},
{
"acceleration": -2.700000000000007,
"curvature": -1.0034381037538245,
"pose": {
"rotation": {
"radians": -0.6539529963266292
},
"translation": {
"x": 11.506441598308642,
"y": 5.235076381802857
}
},
"time": 2.2845417401028505,
"velocity": 1.687571360667084
},
{
"acceleration": -2.699999999999999,
"curvature": -0.9572797878831514,
"pose": {
"rotation": {
"radians": -0.6973308876777895
},
"translation": {
"x": 11.540921310059838,
"y": 5.207431995289367
}
},
"time": 2.3113022293624477,
"velocity": 1.6153180396661708
},
{
"acceleration": -2.700000000000001,
"curvature": -0.8314972139974145,
"pose": {
"rotation": {
"radians": -0.77473218747353
},
"translation": {
"x": 11.60472799796737,
"y": 5.149528260899466
}
},
"time": 2.367260714617698,
"velocity": 1.4642301294769957
},
{
"acceleration": -2.7000000000000006,
"curvature": -0.6721175410273444,
"pose": {
"rotation": {
"radians": -0.8377469409666946
},
"translation": {
"x": 11.66246720986615,
"y": 5.089196744353265
}
},
"time": 2.4276562948042875,
"velocity": 1.3011620629732035
},
{
"acceleration": -2.6999999999999984,
"curvature": -0.4921070942713161,
"pose": {
"rotation": {
"radians": -0.8850958775784791
},
"translation": {
"x": 11.71522361591979,
"y": 5.027589071917241
}
},
"time": 2.494648927605333,
"velocity": 1.1202819544103801
},
{
"acceleration": -2.6999999999999997,
"curvature": -0.30558760548176167,
"pose": {
"rotation": {
"radians": -0.9166142579946267
},
"translation": {
"x": 11.764185125869503,
"y": 4.965624954864703
}
},
"time": 2.572434307904183,
"velocity": 0.9102614276034858
},
{
"acceleration": -2.7,
"curvature": -0.13211390449262037,
"pose": {
"rotation": {
"radians": -0.9333755998728668
},
"translation": {
"x": 11.810603613107844,
"y": 4.903885583390221
}
},
"time": 2.6719919335293785,
"velocity": 0.6414558384154581
},
{
"acceleration": -2.7,
"curvature": -3.216427801929387e-14,
"pose": {
"rotation": {
"radians": -0.938047491792717
},
"translation": {
"x": 11.855755638752447,
"y": 4.842507020524062
}
},
"time": 2.909568169979548,
"velocity": 0.0
}
]
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+917
View File
@@ -0,0 +1,917 @@
[
{
"acceleration": -2.6999999999999953,
"curvature": null,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.131085292508499,
"y": 7.512157572373793
}
},
"time": 0.0,
"velocity": 5.197756949199695
},
{
"acceleration": -2.6999999999999895,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.2052010302051324,
"y": 7.512157572373793
}
},
"time": 0.014312380928600156,
"velocity": 5.1591135206924745
},
{
"acceleration": -2.69999999999998,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.2686367053576,
"y": 7.512157572373793
}
},
"time": 0.02664804723884729,
"velocity": 5.125807221654807
},
{
"acceleration": -2.699999999999998,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.3566702134479183,
"y": 7.512157572373793
}
},
"time": 0.04390100888796227,
"velocity": 5.079224225202197
},
{
"acceleration": -2.6999999999999766,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.4706375920167694,
"y": 7.512157572373793
}
},
"time": 0.06647439339795713,
"velocity": 5.018276087025211
},
{
"acceleration": -2.7000000000000224,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.5374940119507254,
"y": 7.512157572373793
}
},
"time": 0.0798450739169341,
"velocity": 4.982175249623974
},
{
"acceleration": -2.700000000000021,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.6108971765711986,
"y": 7.512157572373793
}
},
"time": 0.09463752163621046,
"velocity": 4.942235640781927
},
{
"acceleration": -2.699999999999978,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.690754964543172,
"y": 7.512157572373793
}
},
"time": 0.11086770760191486,
"velocity": 4.898414138674525
},
{
"acceleration": -2.699999999999974,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.7769262263787997,
"y": 7.512157572373793
}
},
"time": 0.1285454988613542,
"velocity": 4.850684102274039
},
{
"acceleration": -2.699999999999975,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.8692238039934734,
"y": 7.512157572373793
}
},
"time": 0.14767508889406286,
"velocity": 4.799034209185726
},
{
"acceleration": -2.6999999999999784,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 3.967417550261895,
"y": 7.512157572373793
}
},
"time": 0.16825538327434214,
"velocity": 4.743467414358973
},
{
"acceleration": -2.7000000000000064,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.071237348574138,
"y": 7.512157572373793
}
},
"time": 0.19028034364042584,
"velocity": 4.684000021370547
},
{
"acceleration": -2.699999999999994,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.180376132391723,
"y": 7.512157572373793
}
},
"time": 0.21373929291945598,
"velocity": 4.620660858317166
},
{
"acceleration": -2.6999999999999873,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.294492904803681,
"y": 7.512157572373793
}
},
"time": 0.23861718457886155,
"velocity": 4.553490550836771
},
{
"acceleration": -2.7000000000000037,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.413215758082623,
"y": 7.512157572373793
}
},
"time": 0.2648948384620612,
"velocity": 4.482540885352132
},
{
"acceleration": -2.699999999999988,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.536144893240808,
"y": 7.512157572373793
}
},
"time": 0.29254914553323685,
"velocity": 4.407874256259958
},
{
"acceleration": -2.699999999999974,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.662855639586213,
"y": 7.512157572373793
}
},
"time": 0.32155324361205206,
"velocity": 4.329563191447157
},
{
"acceleration": -2.6999999999999944,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.727490349600101,
"y": 7.512157572373793
}
},
"time": 0.3365520806877093,
"velocity": 4.289066331342883
},
{
"acceleration": -2.6999999999999704,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.792901474278599,
"y": 7.512157572373793
}
},
"time": 0.3518766659314926,
"velocity": 4.247689951184668
},
{
"acceleration": -2.7000000000000135,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.859030279264434,
"y": 7.512157572373793
}
},
"time": 0.36752264795151995,
"velocity": 4.205445799730595
},
{
"acceleration": -2.699999999999975,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.925817041885582,
"y": 7.512157572373793
}
},
"time": 0.3834854641052438,
"velocity": 4.16234619611554
},
{
"acceleration": -2.699999999999988,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 4.9932011455163865,
"y": 7.512157572373793
}
},
"time": 0.39976034303474123,
"velocity": 4.118404023005898
},
{
"acceleration": -2.7000000000000184,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.061121173938696,
"y": 7.512157572373793
}
},
"time": 0.41634230684842155,
"velocity": 4.073632720708961
},
{
"acceleration": -2.699999999999969,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.129515005702981,
"y": 7.512157572373793
}
},
"time": 0.43322617295557325,
"velocity": 4.028046282219651
},
{
"acceleration": -2.7000000000000193,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.198319908489468,
"y": 7.512157572373793
}
},
"time": 0.4504065555593223,
"velocity": 3.981659249189529
},
{
"acceleration": -2.7000000000000024,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.267472633469263,
"y": 7.512157572373793
}
},
"time": 0.46787786681273724,
"velocity": 3.9344867088053084
},
{
"acceleration": -2.699999999999996,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.336909509665481,
"y": 7.512157572373793
}
},
"time": 0.48563431764202536,
"velocity": 3.8865442915662305
},
{
"acceleration": -2.699999999999999,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.406566538314371,
"y": 7.512157572373793
}
},
"time": 0.5036699182399786,
"velocity": 3.837848169951757
},
{
"acceleration": -2.699999999999999,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.476379487226445,
"y": 7.512157572373793
}
},
"time": 0.5219784782320971,
"velocity": 3.788415057973037
},
{
"acceleration": -2.699999999999995,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.546283985147603,
"y": 7.512157572373793
}
},
"time": 0.5405536065171157,
"velocity": 3.738262211603487
},
{
"acceleration": -2.69999999999999,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.6162156161202645,
"y": 7.512157572373793
}
},
"time": 0.5593887107830131,
"velocity": 3.687407430085564
},
{
"acceleration": -2.69999999999999,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.6861100138444876,
"y": 7.512157572373793
}
},
"time": 0.5784769966989861,
"velocity": 3.635869058112437
},
{
"acceleration": -2.7000000000000126,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.755902956039106,
"y": 7.512157572373793
}
},
"time": 0.5978114667833578,
"velocity": 3.5836659888846336
},
{
"acceleration": -2.699999999999996,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.825530458802847,
"y": 7.512157572373793
}
},
"time": 0.617384918946943,
"velocity": 3.5308176680429533
},
{
"acceleration": -2.700000000000005,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.894928870975467,
"y": 7.512157572373793
}
},
"time": 0.6371899447110825,
"velocity": 3.4773440984797768
},
{
"acceleration": -2.700000000000018,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 5.964034968498871,
"y": 7.512157572373793
}
},
"time": 0.6572189270993338,
"velocity": 3.423265846031498
},
{
"acceleration": -2.699999999999988,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.032786048778246,
"y": 7.512157572373793
}
},
"time": 0.677464038201795,
"velocity": 3.3686040460548523
},
{
"acceleration": -2.7000000000000144,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.101120025043182,
"y": 7.512157572373793
}
},
"time": 0.6979172364111738,
"velocity": 3.31338041088953
},
{
"acceleration": -2.700000000000017,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.168975520708806,
"y": 7.512157572373793
}
},
"time": 0.7185702633301351,
"velocity": 3.257617238208334
},
{
"acceleration": -2.699999999999987,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.236291963736903,
"y": 7.512157572373793
}
},
"time": 0.7394146403501526,
"velocity": 3.2013374202542866
},
{
"acceleration": -2.7000000000000015,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.303009680997048,
"y": 7.512157572373793
}
},
"time": 0.7604416649031897,
"velocity": 3.144564453961087
},
{
"acceleration": -2.6999999999999944,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.369069992627728,
"y": 7.512157572373793
}
},
"time": 0.7816424063890558,
"velocity": 3.087322451949248
},
{
"acceleration": -2.699999999999989,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.434415306397477,
"y": 7.512157572373793
}
},
"time": 0.8030077017834331,
"velocity": 3.0296361543844297
},
{
"acceleration": -2.700000000000014,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.4989892120659905,
"y": 7.512157572373793
}
},
"time": 0.8245281509343639,
"velocity": 2.9715309416769164
},
{
"acceleration": -2.700000000000004,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.562736575745267,
"y": 7.512157572373793
}
},
"time": 0.8461941115587359,
"velocity": 2.913032847991112
},
{
"acceleration": -2.7000000000000015,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.687538089512336,
"y": 7.512157572373793
}
},
"time": 0.8899227554550374,
"velocity": 2.7949655094710977
},
{
"acceleration": -2.6999999999999953,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.808407889363413,
"y": 7.512157572373793
}
},
"time": 0.9341114453913719,
"velocity": 2.6756560466429944
},
{
"acceleration": -2.699999999999996,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 6.924960477712095,
"y": 7.512157572373793
}
},
"time": 0.9786737567347271,
"velocity": 2.5553378060159355
},
{
"acceleration": -2.7000000000000015,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.03683983727693,
"y": 7.512157572373793
}
},
"time": 1.023518832974771,
"velocity": 2.4342561001678167
},
{
"acceleration": -2.700000000000005,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.143722450637484,
"y": 7.512157572373793
}
},
"time": 1.0685511927496112,
"velocity": 2.312668728775748
},
{
"acceleration": -2.7000000000000073,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.2453203197903955,
"y": 7.512157572373793
}
},
"time": 1.1136705562604592,
"velocity": 2.190846447296458
},
{
"acceleration": -2.7000000000000033,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.3413839857054635,
"y": 7.512157572373793
}
},
"time": 1.158771718442661,
"velocity": 2.069073309404513
},
{
"acceleration": -2.700000000000001,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.4317055478816885,
"y": 7.512157572373793
}
},
"time": 1.203744512407594,
"velocity": 1.9476467656991934
},
{
"acceleration": -2.6999999999999984,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.516121683903376,
"y": 7.512157572373793
}
},
"time": 1.248473931967149,
"velocity": 1.8268773328883954
},
{
"acceleration": -2.7000000000000033,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.594516668996175,
"y": 7.512157572373793
}
},
"time": 1.2928405218501982,
"velocity": 1.7070875402041628
},
{
"acceleration": -2.6999999999999993,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.666825395583165,
"y": 7.512157572373793
}
},
"time": 1.3367212072055774,
"velocity": 1.5886096897446385
},
{
"acceleration": -2.6999999999999997,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.733036392840902,
"y": 7.512157572373793
}
},
"time": 1.3799908344582454,
"velocity": 1.4717816961624348
},
{
"acceleration": -2.700000000000001,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.847405617178784,
"y": 7.512157572373793
}
},
"time": 1.4642038682149823,
"velocity": 1.2444065050192454
},
{
"acceleration": -2.7000000000000006,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 7.938720053622753,
"y": 7.512157572373793
}
},
"time": 1.5445948832909597,
"velocity": 1.027350764314106
},
{
"acceleration": -2.6999999999999997,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 8.061921233296093,
"y": 7.512157572373793
}
},
"time": 1.6937505482524744,
"velocity": 0.6246304689180164
},
{
"acceleration": -2.6999999999999997,
"curvature": 0.0,
"pose": {
"rotation": {
"radians": 0.0
},
"translation": {
"x": 8.134173681944379,
"y": 7.512157572373793
}
},
"time": 1.9250951663702582,
"velocity": 0.0
}
]
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1,9 +1,9 @@
{
"lengthUnit": "Meter",
"exportUnit": "Always Meters",
"maxVelocity": 2.6,
"maxVelocity": 2.3,
"maxAcceleration": 2.7,
"trackWidth": 0.648,
"gameName": "Infinite Recharge 2021",
"outputDir": ".."
"outputDir": ""
}
+8
View File
@@ -0,0 +1,8 @@
{
"lengthUnit": "Meter",
"maxVelocity": 2.3,
"maxAcceleration": 2.7,
"wheelBase": 0.648,
"gameName": "Bounce Path",
"outputDir": ""
}
+55 -12
View File
@@ -41,6 +41,7 @@ import frc4388.robot.commands.auto.GalacticSearch;
import frc4388.robot.commands.auto.IdentifyPath;
import frc4388.robot.commands.auto.SequentialTest;
import frc4388.robot.commands.auto.SixBallAutoMiddle;
import frc4388.robot.commands.auto.SixBallTop;
import frc4388.robot.commands.auto.Slalom;
import frc4388.robot.commands.auto.TenBallAutoMiddle;
import frc4388.robot.commands.auto.Wait;
@@ -120,21 +121,21 @@ public class RobotContainer {
/* Autos */
double m_totalTimeAuto;
SixBallAutoMiddle m_sixBallAutoMiddle;
//SixBallAutoMiddle m_sixBallAutoMiddle;
SixBallAutoMiddle m_sixBallAutoMiddle0;
//SixBallAutoMiddle m_sixBallAutoMiddle0;
SixBallAutoMiddle m_sixBallAutoMiddle1;
//SixBallAutoMiddle m_sixBallAutoMiddle1;
EightBallAutoMiddle m_eightBallAutoMiddle;
//EightBallAutoMiddle m_eightBallAutoMiddle;
DriveOffLineForward m_driveOffLineForward;
DriveOffLineBackward m_driveOffLineBackward;
FiveBallAutoMiddle m_fiveBallAutoMiddle;
//FiveBallAutoMiddle m_fiveBallAutoMiddle;
TenBallAutoMiddle m_tenBallAutoMiddle;
//TenBallAutoMiddle m_tenBallAutoMiddle;
Slalom m_slalom;
@@ -150,6 +151,12 @@ public class RobotContainer {
GalacticSearch m_galacticSearch;
SixBallTop m_sixBallTop;
EightBallMid m_eightBallMid;
FiveBallBottom m_fiveBallBottom;
public static boolean m_isShooterManual = false;
/**
@@ -345,7 +352,7 @@ public class RobotContainer {
String[] sixBallAutoMiddlePaths = new String[]{
"SixBallMidComplete"
};
/*
m_sixBallAutoMiddle = new SixBallAutoMiddle(m_robotDrive, buildPaths(sixBallAutoMiddlePaths));
String[] sixBallAutoMiddle0Paths = new String[]{
@@ -359,7 +366,7 @@ public class RobotContainer {
};
m_sixBallAutoMiddle1 = new SixBallAutoMiddle(m_robotDrive, buildPaths(sixBallAutoMiddle1Paths));
*/
String[] slalom = new String[]{
"Slalom"
};
@@ -397,6 +404,7 @@ public class RobotContainer {
"EightBallMidComplete"
};
/*
m_eightBallAutoMiddle = new EightBallAutoMiddle(m_robotDrive, buildPaths(eightBallAutoMiddlePaths));
String[] driveOffLineForwardPaths = new String[]{
@@ -404,7 +412,7 @@ public class RobotContainer {
};
m_driveOffLineForward = new DriveOffLineForward(m_robotDrive, this, buildPaths(driveOffLineForwardPaths));
*/
String[] driveOffLineBackwardPaths = new String[]{
"DriveOffLineBackward"
};
@@ -415,6 +423,7 @@ public class RobotContainer {
"FiveBallMidComplete"
};
/*
m_fiveBallAutoMiddle = new FiveBallAutoMiddle(m_robotDrive, buildPaths(fiveBallAutoMiddlePaths));
String[] tenBallAutoMiddlePaths = new String[]{
@@ -424,15 +433,34 @@ public class RobotContainer {
m_tenBallAutoMiddle = new TenBallAutoMiddle(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter,
m_robotShooterAim, m_robotDrive,buildPaths(tenBallAutoMiddlePaths));
*/
String[] galacticSearchPaths = new String[]{
"GSC_ARED",
"GSC_ABLUE",
"GSC_BRED",
"GSC_BBLUE"
};
m_galacticSearch = new GalacticSearch(m_robotLime, m_robotIntake, buildPaths(galacticSearchPaths));
String[] sixBallTopPaths = new String[]{
"6BallTop"
};
m_sixBallTop = new SixBallTop(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(sixBallTopPaths));
String[] eightBallMidPaths = new String[]{
"2BallOffensive",
"LoopFrom2BallOffensive"
};
m_eightBallMid = new EightBallMid(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(eightBallMidPaths));
String[] fiveBallBottomPaths = new String[]{
"5BallBottom1",
"5BallBottom2",
"5BallBottom3"
};
m_fiveBallBottom = new FiveBallBottom(m_robotShooterHood, m_robotStorage, m_robotIntake, m_robotShooter, m_robotShooterAim, m_robotDrive, buildPaths(fiveBallBottomPaths));
}
public void idenPath()
@@ -455,14 +483,29 @@ public class RobotContainer {
//return m_sixBallAutoMiddle.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0));
//return m_sixBallAutoMiddle1.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0));
//return m_eightBallAutoMiddle.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0));
//return m_driveOffLineBackward.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0));
//return m_fiveBallAutoMiddle.andThen(() -> m_robotDrive.tankDriveVelocity(0, 0));
//return m_tenBallAutoMiddle.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0));
//return m_slalom.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0));
//return m_barrel.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0));
//return m_barrelStart.andThen(()-> m_robotDrive.tankDriveVelocity(0, 0));
//return m_sequentialTest.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
return m_galacticSearch.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
//return m_galacticSearch.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
//return m_sixBallTop.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
//return m_eightBallMid.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
return m_fiveBallBottom.andThen(() -> m_robotDrive.tankDriveVelocity(0,0));
/*
TODO
11BallTop
6BallOffensive (Trench)
6BallOffensive2
8BallOffensive
5BallBottom*
8BallMid*
6BallTop*
*/
} catch (Exception e) {
@@ -28,7 +28,7 @@ public class AutoPath1FromCenter extends SequentialCommandGroup {
m_drive = subsystem;
m_pneumatics = subsystem2;
addCommands( new Wait(m_drive, 0, 1),
addCommands( new Wait(m_drive, 0),
//shoot pre-loaded 3 balls
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, 75, 44, -90),
//Start Intake Ball 1
@@ -39,7 +39,7 @@ public class AutoPath1FromCenter extends SequentialCommandGroup {
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, 0, 28),
//Start Intake Ball 3
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, 0, 8),
new Wait(m_drive, 0, 2)
new Wait(m_drive, 0)
//Shoot 3 Balls
);
}
@@ -28,7 +28,7 @@ public class AutoPath2FromRight extends SequentialCommandGroup {
m_drive = subsystem;
m_pneumatics = subsystem2;
addCommands( new Wait(m_drive, 0, 1),
addCommands( new Wait(m_drive, 0),
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, 0, 77),
//Start Intake Ball 1
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, 0, 8),
@@ -48,7 +48,7 @@ public class AutoPath2FromRight extends SequentialCommandGroup {
//Move to 10th Ball
new GotoCoordinatesRobotRelative(m_drive, m_pneumatics, -6.34, 13.30),
//Shoot 5 more Balls (Total 10 Ball Autonomous Path)
new Wait(m_drive, 0, 2)
new Wait(m_drive, 0)
);
}
}
@@ -0,0 +1,60 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.ParallelDeadlineGroup;
import edu.wpi.first.wpilibj2.command.RamseteCommand;
import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.subsystems.Intake;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.robot.subsystems.ShooterHood;
import frc4388.robot.subsystems.Storage;
import frc4388.robot.commands.intake.RunExtenderOutIn;
import frc4388.robot.commands.intake.RunIntake;
import frc4388.robot.commands.shooter.CalibrateShooter;
import frc4388.robot.commands.shooter.TrackTarget;
import frc4388.robot.subsystems.Drive;
// NOTE: Consider using this command inline, rather than writing a subclass. For more
// information, see:
// https://docs.wpilib.org/en/latest/docs/software/commandbased/convenience-features.html
public class EightBallMid extends SequentialCommandGroup {
/**
* Creates a new EightBallMid.
*/
public EightBallMid(ShooterHood shooterHood, Storage storage, Intake intake, Shooter shooter, ShooterAim shooterAim, Drive drive, RamseteCommand[] paths) {
// Add your commands in the super() call, e.g.
// super(new FooCommand(), new BarCommand());
addCommands(
//TODO REWRITE
//Shoot and Extend Intake
new CalibrateShooter(shooter, shooterAim, shooterHood),
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle())),
new RunExtenderOutIn(intake)
),
//Intake and Path
new ParallelDeadlineGroup(
paths[0],
new RunIntake(intake)
),
//Shoot
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle()))
)
);
}
}
@@ -0,0 +1,60 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.ParallelDeadlineGroup;
import edu.wpi.first.wpilibj2.command.RamseteCommand;
import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.subsystems.Intake;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.robot.subsystems.ShooterHood;
import frc4388.robot.subsystems.Storage;
import frc4388.robot.commands.intake.RunExtenderOutIn;
import frc4388.robot.commands.intake.RunIntake;
import frc4388.robot.commands.shooter.CalibrateShooter;
import frc4388.robot.commands.shooter.TrackTarget;
import frc4388.robot.subsystems.Drive;
// NOTE: Consider using this command inline, rather than writing a subclass. For more
// information, see:
// https://docs.wpilib.org/en/latest/docs/software/commandbased/convenience-features.html
public class FiveBallBottom extends SequentialCommandGroup {
/**
* Creates a new FiveBallBottom.
*/
public FiveBallBottom(ShooterHood shooterHood, Storage storage, Intake intake, Shooter shooter, ShooterAim shooterAim, Drive drive, RamseteCommand[] paths) {
// Add your commands in the super() call, e.g.
// super(new FooCommand(), new BarCommand());
//TODO Rewrite
addCommands(
//Shoot and Extend Intake
new CalibrateShooter(shooter, shooterAim, shooterHood),
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle())),
new RunExtenderOutIn(intake)
),
//Intake and Path
new ParallelDeadlineGroup(
paths[0],
new RunIntake(intake)
),
//Shoot
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle()))
)
);
}
}
@@ -0,0 +1,59 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.ParallelDeadlineGroup;
import edu.wpi.first.wpilibj2.command.RamseteCommand;
import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.subsystems.Intake;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.robot.subsystems.ShooterHood;
import frc4388.robot.subsystems.Storage;
import frc4388.robot.commands.intake.RunExtenderOutIn;
import frc4388.robot.commands.intake.RunIntake;
import frc4388.robot.commands.shooter.CalibrateShooter;
import frc4388.robot.commands.shooter.TrackTarget;
import frc4388.robot.subsystems.Drive;
// NOTE: Consider using this command inline, rather than writing a subclass. For more
// information, see:
// https://docs.wpilib.org/en/latest/docs/software/commandbased/convenience-features.html
public class SixBallTop extends SequentialCommandGroup {
/**
* Creates a new SixBallTop.
*/
public SixBallTop(ShooterHood shooterHood, Storage storage, Intake intake, Shooter shooter, ShooterAim shooterAim, Drive drive, RamseteCommand[] paths) {
// Add your commands in the super() call, e.g.
// super(new FooCommand(), new BarCommand());
addCommands(
//Shoot and Extend Intake
new CalibrateShooter(shooter, shooterAim, shooterHood),
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle())),
new RunExtenderOutIn(intake)
),
//Intake and Path
new ParallelDeadlineGroup(
paths[0],
new RunIntake(intake)
),
//Shoot
new ParallelDeadlineGroup(
new Wait(drive,5),
new TrackTarget(shooterAim),
new RunCommand(() -> shooterHood.runAngleAdjustPID(shooterHood.addFireAngle()))
)
);
}
}
@@ -35,15 +35,15 @@ public class TenBallAutoMiddle extends SequentialCommandGroup {
// super(new FooCommand(), new BarCommand());
addCommands(
new ParallelDeadlineGroup(
new Wait(drive, 0.1, 0),
new Wait(drive, 0.1),
new CalibrateShooter(shooter, shooterAim, shooterHood)
),
new ParallelDeadlineGroup(
new Wait(drive, 1, 0),
new Wait(drive, 1),
new RunCommand(() -> shooterAim.runShooterWithInput(-0.75), shooterAim)
),
new ParallelDeadlineGroup(
new Wait(drive, 4, 0),
new Wait(drive, 4),
new PrepChecker(shooter, shooterAim),
new RunCommand(() -> intake.runExtender(IntakeConstants.EXTENDER_SPEED), intake),
new ShootPrepGroup(shooter, shooterAim, shooterHood, storage)
@@ -23,12 +23,12 @@ public class Wait extends CommandBase {
/**
* Creates a new WaitCommand.
*/
public Wait(SubsystemBase subsystem, double seconds, int waitNum) {
public Wait(SubsystemBase subsystem, double seconds) {
// Use addRequirements() here to declare subsystem dependencies.
m_waitTime = (long) (seconds * 1000);
m_subsystem = subsystem;
m_waitNum = waitNum;
// m_waitNum = waitNum;
addRequirements(m_subsystem);
}
@@ -44,7 +44,7 @@ public class GotoCoordinatesRobotRelative extends SequentialCommandGroup {
m_endAngle = endAngle;
addCommands( new TurnDegrees(m_drive, m_currentAngle),
new Wait(m_drive, 0, 0),
new Wait(m_drive, 0),
new DriveStraightToPositionPID(m_drive, m_pneumatics, m_hypotDist),
new TurnDegrees(m_drive, (m_endAngle - m_currentAngle) % 360));
}
@@ -63,7 +63,7 @@ public class GotoCoordinatesRobotRelative extends SequentialCommandGroup {
m_endAngle = m_currentAngle;
addCommands( new TurnDegrees(m_drive, m_currentAngle),
new Wait(m_drive, 0, 0),
new Wait(m_drive, 0),
new DriveStraightToPositionPID(m_drive, m_pneumatics, m_hypotDist),
new TurnDegrees(m_drive, m_endAngle - m_currentAngle));
}
@@ -46,9 +46,9 @@ public class RunExtenderOutIn extends CommandBase {
@Override
public void execute() {
if (m_intake.isExtended){
m_intake.runExtender(0.3);
m_intake.runExtender(0.5);
} else {
m_intake.runExtender(-0.3);
m_intake.runExtender(-0.5);
}
}
@@ -11,6 +11,7 @@ import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.Constants.VisionConstants;
import frc4388.robot.subsystems.LimeLight;
import frc4388.robot.subsystems.Shooter;
@@ -115,6 +116,19 @@ public class TrackTarget extends CommandBase {
m_shooterHood.m_fireAngle = fireAngle;// + m_shooter.shooterTrims.m_hoodTrim;
m_shooterAim.m_targetDistance = distance;
}
else{
//Sweeping
double turn = -0.5;
if (m_shooterAim.getShooterRotatePosition() > ShooterConstants.TURRET_RIGHT_SOFT_LIMIT - 1)
{
turn = -0.5;
}
if (m_shooterAim.getShooterRotatePosition() < ShooterConstants.TURRET_LEFT_SOFT_LIMIT + 1)
{
turn = 0.5;
}
m_shooterAim.runShooterWithInput(turn);
}
}
// Called once the command ends or is interrupted.
@@ -132,6 +132,7 @@ public class ShooterAim extends SubsystemBase {
return m_targetDistance * Math.sin(getTargetAngleDegrees());
}
/**
* Gets the angle of the Shooter relative to the inner port.
* Use for tuning the Shooter Displacement