Skip to content

Commit

Permalink
Merge pull request #1 from vikings204/MrCoyne
Browse files Browse the repository at this point in the history 
bring other changes into auto subsys to allow continued work on auto
  • Loading branch information
@team204frc
team204frc authored Feb 3, 2024
2 parents 9d74e0c + dfa209a commit 45a92b8
Show file tree
Hide file tree
Showing 10 changed files with 685 additions and 214 deletions.
191 changes: 100 additions & 91 deletions autonomous.chor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"robotConfiguration": {
"mass": 37.04398850154597,
"rotationalInertia": 3,
"motorMaxTorque": 0.18121546961325966,
"motorMaxVelocity": 4704,
"motorMaxTorque": 0.7248618784530386,
"motorMaxVelocity": 2822,
"gearing": 8.14,
"wheelbase": 0.6667496399551944,
"trackWidth": 0.6667496399551944,
Expand All @@ -22,11 +22,11 @@
"isInitialGuess": false,
"translationConstrained": true,
"headingConstrained": true,
"controlIntervalCount": 12
"controlIntervalCount": 13
},
{
"x": 0,
"y": 1,
"y": 2,
"heading": 0,
"isInitialGuess": false,
"translationConstrained": true,
Expand All @@ -39,118 +39,127 @@
"x": 0,
"y": 0,
"heading": 0,
"angularVelocity": -7.600376309198775e-18,
"velocityX": 9.47848126641677e-34,
"velocityY": 2.3685455382964595,
"angularVelocity": -3.947033998189832e-17,
"velocityX": -3.612854008750732e-31,
"velocityY": 1.2005140973885657,
"timestamp": 0
},
{
"x": 3.444002287789685e-36,
"y": 0.16666663815137714,
"heading": -2.2326890701092606e-22,
"angularVelocity": -3.2118068414505653e-21,
"velocityX": 4.9543256977745e-35,
"velocityY": 2.3975617978327155,
"timestamp": 0.0695150541279211
"x": 1.1944785629958918e-34,
"y": 0.17191154064183406,
"heading": 8.946622442095673e-18,
"angularVelocity": 9.597955586605163e-17,
"velocityX": 1.2814391555427755e-33,
"velocityY": 1.8442706648059815,
"timestamp": 0.0932138345647434
},
{
"x": 1.80940340937385e-36,
"y": 0.31818178117808316,
"heading": -8.171022190596369e-22,
"angularVelocity": -8.542513749172842e-21,
"velocityX": -2.3514315537398912e-35,
"velocityY": 2.1796018851958148,
"timestamp": 0.1390301082558422
"x": 3.0218756793156384e-34,
"y": 0.34382308128367217,
"heading": -1.6139197453297265e-18,
"angularVelocity": -1.132937212242932e-16,
"velocityX": 1.960435468763232e-33,
"velocityY": 1.8442706648060243,
"timestamp": 0.1864276691294868
},
{
"x": 5.9379803896552905e-37,
"y": 0.4545454170640189,
"heading": -1.0153633602375655e-21,
"angularVelocity": -2.8520602469919215e-21,
"velocityX": -1.7486936861866492e-35,
"velocityY": 1.9616417997028441,
"timestamp": 0.2085451623837633
"x": 5.424652677084512e-34,
"y": 0.5157346219255102,
"heading": -1.5884909113524752e-17,
"angularVelocity": -1.5309947750602212e-16,
"velocityX": 2.577704286588845e-33,
"velocityY": 1.8442706648060245,
"timestamp": 0.2796415036942302
},
{
"x": 9.346108964575416e-37,
"y": 0.575757541803813,
"heading": -9.823771839587742e-22,
"angularVelocity": 4.745184644957e-22,
"velocityX": 4.902720218198206e-36,
"velocityY": 1.7436816565911075,
"timestamp": 0.2780602165116844
"x": 8.747257947587387e-34,
"y": 0.6876461625673483,
"heading": 1.7441665329815146e-18,
"angularVelocity": 1.8912509853096619e-16,
"velocityX": 3.564497995151033e-33,
"velocityY": 1.8442706648060245,
"timestamp": 0.3728553382589736
},
{
"x": 2.094062831073701e-36,
"y": 0.6818181533947788,
"heading": -8.40480447256135e-22,
"angularVelocity": 2.0412375100710908e-21,
"velocityX": 1.6679149082686126e-35,
"velocityY": 1.5257214846699805,
"timestamp": 0.34757527063960547
"x": 9.332526707530359e-34,
"y": 0.8595577032091865,
"heading": 4.4302423015963514e-18,
"angularVelocity": 2.881627798231134e-17,
"velocityX": 6.278775686801844e-34,
"velocityY": 1.8442706648060245,
"timestamp": 0.466069172823717
},
{
"x": 4.0842527693840064e-36,
"y": 0.7727272506353046,
"heading": -6.555813623569812e-22,
"angularVelocity": 2.6598423207322688e-21,
"velocityX": 2.8629625672203317e-35,
"velocityY": 1.3077612954632174,
"timestamp": 0.41709032476752655
"x": 7.404560247182679e-34,
"y": 1.0314692438510245,
"heading": -1.9174121317431025e-17,
"angularVelocity": -2.532281150029562e-16,
"velocityX": -2.0683265264103736e-33,
"velocityY": 1.8442706648060245,
"timestamp": 0.5592830073884604
},
{
"x": -2.861998005146919e-37,
"y": 0.8484848327243157,
"heading": -4.732144278399494e-22,
"angularVelocity": 2.6234163690356904e-21,
"velocityX": -6.287059025950303e-35,
"velocityY": 1.0898010947326966,
"timestamp": 0.48660537889544764
"x": 6.388428375393719e-34,
"y": 1.2033807844928626,
"heading": -1.926556919165743e-17,
"angularVelocity": -9.810547399257286e-19,
"velocityX": -1.0901084402040666e-33,
"velocityY": 1.8442706648060245,
"timestamp": 0.6524968419532038
},
{
"x": -2.03857738269056e-36,
"y": 0.9090908990896158,
"heading": -3.0214961018999903e-22,
"angularVelocity": 2.4608311899881687e-21,
"velocityX": -2.520860526747833e-35,
"velocityY": 0.87184088577092,
"timestamp": 0.5561204330233688
"x": 3.0162184012138363e-34,
"y": 1.3752923251347007,
"heading": 4.527535991323288e-18,
"angularVelocity": 2.5525293851584663e-16,
"velocityX": -3.6177140401587575e-33,
"velocityY": 1.8442706648060245,
"timestamp": 0.7457106765179472
},
{
"x": 5.106160606722849e-38,
"y": 0.9545454493020581,
"heading": -1.6145441512322172e-22,
"angularVelocity": 2.0239528885973894e-21,
"velocityX": 3.006023625587289e-35,
"velocityY": 0.6538806706357015,
"timestamp": 0.6256354871512899
"x": 3.354628939612959e-34,
"y": 1.5472038657765388,
"heading": 3.130040657204647e-17,
"angularVelocity": 2.872199250866309e-16,
"velocityX": 3.63047576810033e-34,
"velocityY": 1.8442706648060245,
"timestamp": 0.8389245110826906
},
{
"x": 1.7914848768309607e-36,
"y": 0.984848483027861,
"heading": -5.689927869393762e-23,
"angularVelocity": 1.5040646843361851e-21,
"velocityX": 2.5036637789133933e-35,
"velocityY": 0.43592045069891716,
"timestamp": 0.695150541279211
"x": -2.3908944051347553e-34,
"y": 1.719115406418377,
"heading": 6.073122238228363e-17,
"angularVelocity": 3.157344180470925e-16,
"velocityX": -6.163809634413478e-33,
"velocityY": 1.8442706648060243,
"timestamp": 0.932138345647434
},
{
"x": 2.176452252156848e-48,
"y": 1,
"heading": 5.357751950103021e-41,
"angularVelocity": 8.185174103588329e-22,
"velocityX": -2.577117806968029e-35,
"velocityY": 0.21796022692088016,
"timestamp": 0.7646655954071322
"x": -6.918462356301768e-36,
"y": 1.8910269470602104,
"heading": 4.515056239569573e-17,
"angularVelocity": -1.6714965175867783e-16,
"velocityX": 2.490735185578158e-33,
"velocityY": 1.8442706648059772,
"timestamp": 1.0253521802121774
},
{
"x": 0,
"y": 1,
"heading": 1.7637632388066702e-41,
"angularVelocity": -5.169863684148192e-40,
"velocityX": -3.141686539318957e-47,
"velocityY": 5.499408435381289e-40,
"timestamp": 0.8341806495350533
"y": 2,
"heading": 0,
"angularVelocity": -4.843761937970241e-16,
"velocityX": 7.422140407242795e-35,
"velocityY": 1.1690652299482462,
"timestamp": 1.1185660147769207
},
{
"x": 0,
"y": 2,
"heading": 0,
"angularVelocity": 0,
"velocityX": 0,
"velocityY": 0,
"timestamp": 1.211779849341664
}
],
"constraints": [
Expand All @@ -159,7 +168,7 @@
1
],
"type": "StopPoint",
"uuid": "4e292adc-83c9-4a24-8725-0a82efddefef"
"uuid": "40f8b823-8306-4dc8-8a96-0fc4aeda883f"
}
],
"usesControlIntervalGuessing": true,
Expand Down
Loading

0 comments on commit 45a92b8

Please sign in to comment.