Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

States Competition Changes #137

Merged
merged 18 commits into from
Apr 8, 2024
Merged

States Competition Changes #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a0a5e9e
Re added intake rumble
danjburke12 Apr 4, 2024
73b03db
Red passing target moved closer
danjburke12 Apr 4, 2024
e360221
Inverted sensors
danjburke12 Apr 4, 2024
d67dd84
Merge branch 'states-dev' into intake-rumble
danjburke12 Apr 4, 2024
735dd99
Updated passing heading tolerance
danjburke12 Apr 4, 2024
fc3cbed
Low Pass speed
danjburke12 Apr 4, 2024
eb7c3cb
Source 543 source auton
danjburke12 Apr 4, 2024
2acddb8
Amp Pose Change
danjburke12 Apr 4, 2024
e59fae6
Lowered efficiency timeout to .5s
danjburke12 Apr 5, 2024
c1af548
Adjusted shooting position in Amp123Amp
danjburke12 Apr 5, 2024
f03cfd2
Re added raise and lower shooter buttons
danjburke12 Apr 5, 2024
c1a96c2
Indexer reverse speed change
danjburke12 Apr 5, 2024
15e886d
rumble for endgame
danjburke12 Apr 5, 2024
6014f2d
Climb setpoint change
danjburke12 Apr 5, 2024
6f6435f
New climb setpoints
danjburke12 Apr 5, 2024
6d2e441
heading and more
danjburke12 Apr 5, 2024
d0b3e86
Updated red passing target and increased reverse indexer time
danjburke12 Apr 6, 2024
56c9478
Idle shooter behavior change
danjburke12 Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,564 changes: 4,550 additions & 2,014 deletions choreo.chor
View file
Open in desktop

Large diffs are not rendered by default.

552 changes: 276 additions & 276 deletions src/main/deploy/choreo/Amp123Amp.1.traj
View file
Open in desktop

Large diffs are not rendered by default.

299 changes: 154 additions & 145 deletions src/main/deploy/choreo/Amp123Amp.2.traj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,154 +4,163 @@
"x": 7.922215461730957,
"y": 7.501460552215576,
"heading": -3.141592653589793,
"angularVelocity": -1.0499346894978236e-24,
"velocityX": 9.084828394953248e-23,
"velocityY": 1.8981970138458264e-23,
"angularVelocity": -4.887021379982818e-28,
"velocityX": 3.886354271076163e-28,
"velocityY": -1.0303855400160332e-26,
"timestamp": 0
},
{
"x": 7.876151385792881,
"y": 7.491839594416714,
"heading": -3.137459373216039,
"angularVelocity": 0.04512204388890958,
"velocityX": -0.5028706180636555,
"velocityY": -0.1050297199314756,
"timestamp": 0.09160224177632292
},
{
"x": 7.784023235366767,
"y": 7.472597677008971,
"heading": -3.1291927185312343,
"angularVelocity": 0.09024511326907037,
"velocityX": -1.0057412202975904,
"velocityY": -0.2100594596224855,
"timestamp": 0.18320448355264585
},
{
"x": 7.645831012786099,
"y": 7.4437347973331685,
"heading": -3.1167925316398786,
"angularVelocity": 0.13536990635703927,
"velocityX": -1.5086117970574366,
"velocityY": -0.3150892283431301,
"timestamp": 0.27480672532896877
},
{
"x": 7.4615747213517905,
"y": 7.405250951635026,
"heading": -3.1002585969831578,
"angularVelocity": 0.1804970526495846,
"velocityX": -2.011482337781975,
"velocityY": -0.42011903804836565,
"timestamp": 0.3664089671052917
},
{
"x": 7.23125436554412,
"y": 7.357146134640706,
"heading": -3.0795906482551265,
"angularVelocity": 0.22562710614112028,
"velocityX": -2.514352829596384,
"velocityY": -0.5251489053268301,
"timestamp": 0.4580112088816146
},
{
"x": 6.954869951662876,
"y": 7.299420338669298,
"heading": -3.0547883694353977,
"angularVelocity": 0.2707606095524572,
"velocityX": -3.0172232526375,
"velocityY": -0.6301788564559853,
"timestamp": 0.5496134506579375
},
{
"x": 6.632421490344359,
"y": 7.23207355089869,
"heading": -3.0258513565852074,
"angularVelocity": 0.315898522667705,
"velocityX": -3.520093559564627,
"velocityY": -0.7352089475611036,
"timestamp": 0.6412156924342605
},
{
"x": 6.263909016658944,
"y": 7.155105733710289,
"heading": -2.992778674536124,
"angularVelocity": 0.3610466447954561,
"velocityX": -4.022963483636768,
"velocityY": -0.8402394493394837,
"timestamp": 0.7328179342105834
},
{
"x": 5.941460603699071,
"y": 7.08775880624687,
"heading": -2.9638386302531665,
"angularVelocity": 0.31593161610196907,
"velocityX": -3.520093031644765,
"velocityY": -0.7352104725544615,
"timestamp": 0.8244201759869063
},
{
"x": 5.665076250878686,
"y": 7.030032843534441,
"heading": -2.93903264374954,
"angularVelocity": 0.27080108546031273,
"velocityX": -3.017222586050555,
"velocityY": -0.6301806767282615,
"timestamp": 0.9160224177632292
},
{
"x": 5.434755957457094,
"y": 6.98192786151886,
"heading": -2.918360927775903,
"angularVelocity": 0.22566823227005592,
"velocityX": -2.514352148542323,
"velocityY": -0.5251507068248938,
"timestamp": 1.0076246595395522
},
{
"x": 5.250499723000517,
"y": 6.943443868589686,
"heading": -2.9018235396375913,
"angularVelocity": 0.18053475349100265,
"velocityX": -2.011481715769569,
"velocityY": -0.42012064533470145,
"timestamp": 1.099226901315875
},
{
"x": 5.112307547288026,
"y": 6.9145808700931495,
"heading": -2.889420489648847,
"angularVelocity": 0.1354011621138088,
"velocityX": -1.5086112854086264,
"velocityY": -0.3150905254809658,
"timestamp": 1.190829143092198
},
{
"x": 5.020179430211499,
"y": 6.89533886949241,
"heading": -2.8811517776811173,
"angularVelocity": 0.09026757213999655,
"velocityX": -1.0057408562280363,
"velocityY": -0.21006036782074328,
"timestamp": 1.282431384868521
},
{
"x": 4.974115371704102,
"y": 6.885717868804932,
"heading": -2.877017410600902,
"angularVelocity": 0.0451339072062286,
"velocityX": -0.5028704277770644,
"velocityY": -0.10503018813635066,
"timestamp": 1.3740336266448439
},
{
"x": 4.974115371704102,
"y": 6.885717868804932,
"heading": -2.877017410600902,
"angularVelocity": 1.047268679208872e-24,
"velocityX": -9.075679396761693e-23,
"velocityY": -1.90081502278939e-23,
"timestamp": 1.4656358684211668
"x": 7.876167385729634,
"y": 7.491274215939674,
"heading": -3.137826051040739,
"angularVelocity": 0.04107585383043026,
"velocityX": -0.5021671425030204,
"velocityY": -0.11108484489335924,
"timestamp": 0.09169870368618671
},
{
"x": 7.784071234544686,
"y": 7.470901542750881,
"heading": -3.1302927903278412,
"angularVelocity": 0.08215231415570008,
"velocityX": -1.0043342760888023,
"velocityY": -0.22216969673325468,
"timestamp": 0.18339740737237342
},
{
"x": 7.645927009527813,
"y": 7.440342531671471,
"heading": -3.1189927726917834,
"angularVelocity": 0.12322985147891677,
"velocityX": -1.506501394933923,
"velocityY": -0.3332545592355413,
"timestamp": 0.27509611105856013
},
{
"x": 7.46173471259394,
"y": 7.399597181332789,
"heading": -3.103925862004903,
"angularVelocity": 0.16430887331235208,
"velocityX": -2.008668492896249,
"velocityY": -0.4443394366633709,
"timestamp": 0.36679481474474684
},
{
"x": 7.231494346293536,
"y": 7.348665489922966,
"heading": -3.085091893190688,
"angularVelocity": 0.20538969535130086,
"velocityX": -2.510835563045012,
"velocityY": -0.5554243338501522,
"timestamp": 0.45849351843093356
},
{
"x": 6.955205914024191,
"y": 7.287547455160863,
"heading": -3.0624906837623587,
"angularVelocity": 0.24647250745959687,
"velocityX": -3.0130025961420928,
"velocityY": -0.6665092559133878,
"timestamp": 0.5501922221171203
},
{
"x": 6.632869420780498,
"y": 7.216243074394265,
"heading": -3.0361220490158694,
"angularVelocity": 0.28755733381715537,
"velocityX": -3.515169574771738,
"velocityY": -0.7775942068997668,
"timestamp": 0.641890925803307
},
{
"x": 6.264484877269656,
"y": 7.134752345460491,
"heading": -3.005985821741955,
"angularVelocity": 0.3286439836384982,
"velocityX": -4.017336436636386,
"velocityY": -0.8886791814708094,
"timestamp": 0.7335896294894937
},
{
"x": 5.8961004243979955,
"y": 7.053261408928639,
"heading": -2.975843795391749,
"angularVelocity": 0.328707224186706,
"velocityX": -4.017335448190788,
"velocityY": -0.8886814453858729,
"timestamp": 0.8252883331756804
},
{
"x": 5.573764018551528,
"y": 6.981956828803154,
"heading": -2.9494695427730693,
"angularVelocity": 0.2876185982839901,
"velocityX": -3.515168621680565,
"velocityY": -0.7775963809641786,
"timestamp": 0.9169870368618671
},
{
"x": 5.297475667295685,
"y": 6.920838610425671,
"heading": -2.9268630863142233,
"angularVelocity": 0.24652972779430415,
"velocityX": -3.013001712667206,
"velocityY": -0.6665112582904563,
"timestamp": 1.0086857405480538
},
{
"x": 5.067235372873985,
"y": 6.869906757353419,
"heading": -2.9080244190706828,
"angularVelocity": 0.20544093303663832,
"velocityX": -2.5108347791876433,
"velocityY": -0.5554260968241282,
"timestamp": 1.1003844442342405
},
{
"x": 4.883043136352518,
"y": 6.829161272261263,
"heading": -2.8929535195404767,
"angularVelocity": 0.1643523727639809,
"velocityX": -2.0086678340820763,
"velocityY": -0.4443409061876841,
"timestamp": 1.1920831479204272
},
{
"x": 4.744898958383866,
"y": 6.798602157111354,
"heading": -2.8816503629970507,
"angularVelocity": 0.12326408214131124,
"velocityX": -1.5065008818599328,
"velocityY": -0.3332556941534239,
"timestamp": 1.283781851606614
},
{
"x": 4.652802839425149,
"y": 6.7782294132091545,
"heading": -2.8741149298364665,
"angularVelocity": 0.08217600530506854,
"velocityX": -1.0043339246527412,
"velocityY": -0.22217046788272427,
"timestamp": 1.3754805552928007
},
{
"x": 4.606754779815674,
"y": 6.768043041229248,
"heading": -2.8703472110739936,
"angularVelocity": 0.041088026449827064,
"velocityX": -0.5021669637453328,
"velocityY": -0.11108523425550758,
"timestamp": 1.4671792589789878
},
{
"x": 4.606754779815674,
"y": 6.768043041229248,
"heading": -2.8703472110739936,
"angularVelocity": 9.657792336234483e-29,
"velocityX": 1.1639834363719072e-27,
"velocityY": 2.2600354905228595e-28,
"timestamp": 1.5588779626651745
}
],
"eventMarkers": []
Expand Down
Loading