Skip to content

Commit

Permalink
District Championship changes (#176)
Browse files Browse the repository at this point in the history 
* auto position changes. Added movement to the pieces while raising arm to fix issue of piece being stuck (untested)

* Dcm pfixing auto intaking (#174)

* changed command structure off intake and raising arm command

* changed auto to start after intake command during rase arm to insert it into preveous cycle. FIxed issue where the intake was "too fast" and reflective sensor was triggering seemingly earlier in auto

* spot :/

* moved blue far piece towards the wall to avoid piece

* auto corrections and stopped rollers on arm raised

* Add custom movement for auto (#175)

* added new constants for auto to change how intake works

* added new auto (match tested ready to merge)

* spot :/ (go merge)

* finals, mirrored auto, changed auto intake height, added auto to pick up far piece and return but stop to avoid teamates. Improved spit out 0.3 second and reduced piece to floor speed

---------

Co-authored-by: bot3O3 <[email protected]>
  • Loading branch information
@nlaverdure @bot3O3
nlaverdure and bot3O3 authored Jun 1, 2024
1 parent 3b1e63d commit 14a6458
Show file tree
Hide file tree
Showing 23 changed files with 8,848 additions and 7,055 deletions.
162 changes: 81 additions & 81 deletions src/main/deploy/choreo/B-driveFwd2m.1.traj
View file
Original file line number Diff line number Diff line change
@@ -1,112 +1,112 @@
{
"samples": [
{
"x": 0.9999999999999971,
"y": 2.0002646446228027,
"heading": 0.8049567558943416,
"angularVelocity": -8.882383616047711e-33,
"velocityX": 2.570897453430358e-16,
"velocityY": -3.401870775942321e-20,
"x": 1,
"y": 2,
"heading": 0,
"angularVelocity": -2.167255414929253e-35,
"velocityX": 0,
"velocityY": 1.0729237673159813e-36,
"timestamp": 0
},
{
"x": 1.0666666719605324,
"y": 2.000255823134675,
"heading": 0.8049567558943416,
"angularVelocity": 3.396420718128266e-27,
"velocityX": 0.7268597690543107,
"velocityY": -0.00009617976470591548,
"timestamp": 0.09171875346361454
"x": 1.066666671960537,
"y": 2,
"heading": -2.2064159489642693e-18,
"angularVelocity": -2.40562799160236e-17,
"velocityX": 0.726859772235986,
"velocityY": 1.2414751413753207e-30,
"timestamp": 0.09171875306213341
},
{
"x": 1.2000000138981668,
"y": 2.000238180158683,
"heading": 0.8049567558943416,
"angularVelocity": -1.124978050975361e-27,
"velocityX": 1.453719516483294,
"velocityY": -0.00019235952655031845,
"timestamp": 0.18343750692722907
"x": 1.2000000138981721,
"y": 2,
"heading": -6.238939336710584e-18,
"angularVelocity": -4.3966098884338405e-17,
"velocityX": 1.453719522846644,
"velocityY": 4.076264826156204e-31,
"timestamp": 0.18343750612426682
},
{
"x": 1.4000000225084717,
"y": 2.0002117156952637,
"heading": 0.8049567558943416,
"angularVelocity": -9.05920074487619e-28,
"velocityX": 2.1805792278843166,
"velocityY": -0.0002885392836274193,
"timestamp": 0.2751562603908436
"x": 1.4000000225084763,
"y": 2,
"heading": -1.1463424269988706e-17,
"angularVelocity": -5.696189642582716e-17,
"velocityX": 2.1805792374293405,
"velocityY": -4.260497847820802e-31,
"timestamp": 0.27515625918640024
},
{
"x": 1.6666666911827144,
"y": 2.000176429745291,
"heading": 0.8049567558943416,
"angularVelocity": 1.6037111849531954e-26,
"velocityX": 2.907438867230956,
"velocityY": -0.0003847190311701196,
"timestamp": 0.36687501385445814
"x": 1.666666691182717,
"y": 2,
"heading": -1.660927541991535e-17,
"angularVelocity": -5.610453586198502e-17,
"velocityX": 2.9074388799576525,
"velocityY": -1.259681057530857e-30,
"timestamp": 0.36687501224853364
},
{
"x": 2.0000000000000013,
"y": 2.0001323223114014,
"heading": 0.8049567558943416,
"angularVelocity": 3.720423796149838e-26,
"velocityX": 3.634298289383412,
"velocityY": -0.00048089874997318956,
"timestamp": 0.45859376731807266
"x": 2.0000000000000004,
"y": 2,
"heading": -1.7865129734989053e-17,
"angularVelocity": -1.3692311810090882e-17,
"velocityX": 3.6342983052917806,
"velocityY": -2.0941736191227216e-30,
"timestamp": 0.45859376531066703
},
{
"x": 2.3333333088172883,
"y": 2.0000882148775116,
"heading": 0.8049567558943416,
"angularVelocity": 1.815590327118958e-26,
"velocityX": 3.6342982893834117,
"velocityY": -0.0004808987499730965,
"timestamp": 0.5503125207816872
"x": 2.333333308817284,
"y": 2,
"heading": -2.614419331441905e-18,
"angularVelocity": 1.6627656030926103e-16,
"velocityX": 3.6342983052917806,
"velocityY": -7.668721594358735e-31,
"timestamp": 0.5503125183728005
},
{
"x": 2.5999999774915312,
"y": 2.000052928927539,
"heading": 0.8049567558943416,
"angularVelocity": -2.3621475473176443e-26,
"velocityX": 2.9074388672309555,
"velocityY": -0.0003847190311700582,
"timestamp": 0.6420312742453018
"x": 2.599999977491524,
"y": 2,
"heading": 1.3547937651055734e-18,
"angularVelocity": 4.327579132505987e-17,
"velocityX": 2.907438879957653,
"velocityY": 6.696205895893734e-32,
"timestamp": 0.6420312714349339
},
{
"x": 2.799999986101836,
"y": 2.0000264644641197,
"heading": 0.8049567558943416,
"angularVelocity": 5.783084016216911e-28,
"velocityX": 2.180579227884316,
"velocityY": -0.00028853928362737873,
"timestamp": 0.7337500277089164
"x": 2.799999986101828,
"y": 2,
"heading": 1.6633017363201664e-18,
"angularVelocity": 3.3635853370126346e-18,
"velocityX": 2.1805792374293405,
"velocityY": 9.022977438111278e-31,
"timestamp": 0.7337500244970673
},
{
"x": 2.9333333280394704,
"y": 2.0000088214881275,
"heading": 0.8049567558943416,
"angularVelocity": -2.351348677796648e-27,
"velocityX": 1.453719516483294,
"velocityY": -0.00019235952655029408,
"timestamp": 0.825468781172531
"x": 2.933333328039463,
"y": 2,
"heading": 8.002561852421958e-19,
"angularVelocity": -9.409705950343789e-18,
"velocityX": 1.453719522846644,
"velocityY": 1.4913843713845408e-30,
"timestamp": 0.8254687775592007
},
{
"x": 3.0000000000000058,
"x": 3,
"y": 2,
"heading": 0.8049567558943416,
"angularVelocity": -5.899958075775622e-27,
"velocityX": 0.7268597690543105,
"velocityY": -0.00009617976470590487,
"timestamp": 0.9171875346361456
"heading": 0,
"angularVelocity": -8.725108122724779e-18,
"velocityX": 0.726859772235986,
"velocityY": 4.284468199881695e-31,
"timestamp": 0.9171875306213341
},
{
"x": 3.000000000000003,
"x": 3,
"y": 2,
"heading": 0.8049567558943416,
"angularVelocity": -1.1372522907103163e-26,
"velocityX": -1.0731025459966149e-17,
"velocityY": 1.4199561562482062e-21,
"timestamp": 1.0089062880997601
"heading": 0,
"angularVelocity": 0,
"velocityX": -1.88079096131566e-37,
"velocityY": 0,
"timestamp": 1.0089062836834675
}
]
}
162 changes: 81 additions & 81 deletions src/main/deploy/choreo/B-driveFwd2m.traj
View file
Original file line number Diff line number Diff line change
@@ -1,112 +1,112 @@
{
"samples": [
{
"x": 0.9999999999999971,
"y": 2.0002646446228027,
"heading": 0.8049567558943416,
"angularVelocity": -8.882383616047711e-33,
"velocityX": 2.570897453430358e-16,
"velocityY": -3.401870775942321e-20,
"x": 1,
"y": 2,
"heading": 0,
"angularVelocity": -2.167255414929253e-35,
"velocityX": 0,
"velocityY": 1.0729237673159813e-36,
"timestamp": 0
},
{
"x": 1.0666666719605324,
"y": 2.000255823134675,
"heading": 0.8049567558943416,
"angularVelocity": 3.396420718128266e-27,
"velocityX": 0.7268597690543107,
"velocityY": -0.00009617976470591548,
"timestamp": 0.09171875346361454
"x": 1.066666671960537,
"y": 2,
"heading": -2.2064159489642693e-18,
"angularVelocity": -2.40562799160236e-17,
"velocityX": 0.726859772235986,
"velocityY": 1.2414751413753207e-30,
"timestamp": 0.09171875306213341
},
{
"x": 1.2000000138981668,
"y": 2.000238180158683,
"heading": 0.8049567558943416,
"angularVelocity": -1.124978050975361e-27,
"velocityX": 1.453719516483294,
"velocityY": -0.00019235952655031845,
"timestamp": 0.18343750692722907
"x": 1.2000000138981721,
"y": 2,
"heading": -6.238939336710584e-18,
"angularVelocity": -4.3966098884338405e-17,
"velocityX": 1.453719522846644,
"velocityY": 4.076264826156204e-31,
"timestamp": 0.18343750612426682
},
{
"x": 1.4000000225084717,
"y": 2.0002117156952637,
"heading": 0.8049567558943416,
"angularVelocity": -9.05920074487619e-28,
"velocityX": 2.1805792278843166,
"velocityY": -0.0002885392836274193,
"timestamp": 0.2751562603908436
"x": 1.4000000225084763,
"y": 2,
"heading": -1.1463424269988706e-17,
"angularVelocity": -5.696189642582716e-17,
"velocityX": 2.1805792374293405,
"velocityY": -4.260497847820802e-31,
"timestamp": 0.27515625918640024
},
{
"x": 1.6666666911827144,
"y": 2.000176429745291,
"heading": 0.8049567558943416,
"angularVelocity": 1.6037111849531954e-26,
"velocityX": 2.907438867230956,
"velocityY": -0.0003847190311701196,
"timestamp": 0.36687501385445814
"x": 1.666666691182717,
"y": 2,
"heading": -1.660927541991535e-17,
"angularVelocity": -5.610453586198502e-17,
"velocityX": 2.9074388799576525,
"velocityY": -1.259681057530857e-30,
"timestamp": 0.36687501224853364
},
{
"x": 2.0000000000000013,
"y": 2.0001323223114014,
"heading": 0.8049567558943416,
"angularVelocity": 3.720423796149838e-26,
"velocityX": 3.634298289383412,
"velocityY": -0.00048089874997318956,
"timestamp": 0.45859376731807266
"x": 2.0000000000000004,
"y": 2,
"heading": -1.7865129734989053e-17,
"angularVelocity": -1.3692311810090882e-17,
"velocityX": 3.6342983052917806,
"velocityY": -2.0941736191227216e-30,
"timestamp": 0.45859376531066703
},
{
"x": 2.3333333088172883,
"y": 2.0000882148775116,
"heading": 0.8049567558943416,
"angularVelocity": 1.815590327118958e-26,
"velocityX": 3.6342982893834117,
"velocityY": -0.0004808987499730965,
"timestamp": 0.5503125207816872
"x": 2.333333308817284,
"y": 2,
"heading": -2.614419331441905e-18,
"angularVelocity": 1.6627656030926103e-16,
"velocityX": 3.6342983052917806,
"velocityY": -7.668721594358735e-31,
"timestamp": 0.5503125183728005
},
{
"x": 2.5999999774915312,
"y": 2.000052928927539,
"heading": 0.8049567558943416,
"angularVelocity": -2.3621475473176443e-26,
"velocityX": 2.9074388672309555,
"velocityY": -0.0003847190311700582,
"timestamp": 0.6420312742453018
"x": 2.599999977491524,
"y": 2,
"heading": 1.3547937651055734e-18,
"angularVelocity": 4.327579132505987e-17,
"velocityX": 2.907438879957653,
"velocityY": 6.696205895893734e-32,
"timestamp": 0.6420312714349339
},
{
"x": 2.799999986101836,
"y": 2.0000264644641197,
"heading": 0.8049567558943416,
"angularVelocity": 5.783084016216911e-28,
"velocityX": 2.180579227884316,
"velocityY": -0.00028853928362737873,
"timestamp": 0.7337500277089164
"x": 2.799999986101828,
"y": 2,
"heading": 1.6633017363201664e-18,
"angularVelocity": 3.3635853370126346e-18,
"velocityX": 2.1805792374293405,
"velocityY": 9.022977438111278e-31,
"timestamp": 0.7337500244970673
},
{
"x": 2.9333333280394704,
"y": 2.0000088214881275,
"heading": 0.8049567558943416,
"angularVelocity": -2.351348677796648e-27,
"velocityX": 1.453719516483294,
"velocityY": -0.00019235952655029408,
"timestamp": 0.825468781172531
"x": 2.933333328039463,
"y": 2,
"heading": 8.002561852421958e-19,
"angularVelocity": -9.409705950343789e-18,
"velocityX": 1.453719522846644,
"velocityY": 1.4913843713845408e-30,
"timestamp": 0.8254687775592007
},
{
"x": 3.0000000000000058,
"x": 3,
"y": 2,
"heading": 0.8049567558943416,
"angularVelocity": -5.899958075775622e-27,
"velocityX": 0.7268597690543105,
"velocityY": -0.00009617976470590487,
"timestamp": 0.9171875346361456
"heading": 0,
"angularVelocity": -8.725108122724779e-18,
"velocityX": 0.726859772235986,
"velocityY": 4.284468199881695e-31,
"timestamp": 0.9171875306213341
},
{
"x": 3.000000000000003,
"x": 3,
"y": 2,
"heading": 0.8049567558943416,
"angularVelocity": -1.1372522907103163e-26,
"velocityX": -1.0731025459966149e-17,
"velocityY": 1.4199561562482062e-21,
"timestamp": 1.0089062880997601
"heading": 0,
"angularVelocity": 0,
"velocityX": -1.88079096131566e-37,
"velocityY": 0,
"timestamp": 1.0089062836834675
}
]
}
Loading

0 comments on commit 14a6458

Please sign in to comment.