From 139897d80380d45365151a25d306623f1ae64131 Mon Sep 17 00:00:00 2001 From: Scorchify <139656419+Scorchify@users.noreply.github.com> Date: Sat, 7 Dec 2024 11:14:47 -0500 Subject: [PATCH] good --- src/main/deploy/choreo/IntakeStack2.traj | 702 +++++++---- src/main/deploy/choreo/ScoreStack2.traj | 305 +++-- .../deploy/pathplanner/autos/1 Stack.auto | 2 +- team5115.chor | 1033 ++++++++++++----- 4 files changed, 1420 insertions(+), 622 deletions(-) diff --git a/src/main/deploy/choreo/IntakeStack2.traj b/src/main/deploy/choreo/IntakeStack2.traj index f15daac..fd1da3f 100644 --- a/src/main/deploy/choreo/IntakeStack2.traj +++ b/src/main/deploy/choreo/IntakeStack2.traj @@ -3,10 +3,10 @@ { "x": 1.3, "y": 5.8, - "heading": -4.4373002037336325e-28, - "angularVelocity": -6.979617908164501e-29, - "velocityX": -2.27392481912151e-18, - "velocityY": 4.734970755779897e-19, + "heading": -3.9553623409205123e-28, + "angularVelocity": -2.2161963154333182e-28, + "velocityX": -3.020585796791611e-20, + "velocityY": -1.2810143670415845e-21, "moduleForcesX": [ 0, 0, @@ -22,319 +22,571 @@ "timestamp": 0 }, { - "x": 1.3390601522355576, - "y": 5.825292487292388, - "heading": -1.3449965190212598e-18, - "angularVelocity": -1.799879286886379e-17, - "velocityX": 0.5227043950701811, - "velocityY": 0.33846499599539814, + "x": 1.3122644109389607, + "y": 5.808311175914892, + "heading": -8.784310841930569e-19, + "angularVelocity": -1.2487327962373592e-17, + "velocityX": 0.1743446065977548, + "velocityY": 0.11814743508336693, "moduleForcesX": [ - 129.55856141356728, - 129.55856141356728, - 129.55856141356728, - 129.55856141356728 + 24.783939482300013, + 24.783939482300013, + 24.783939482300013, + 24.783939482300013 ], "moduleForcesY": [ - 83.8926138436715, - 83.8926138436715, - 83.89261384367151, - 83.89261384367151 + 16.795236389795175, + 16.795236389795175, + 16.795236389795175, + 16.795236389795175 ], - "timestamp": 0.07472703999420775 + "timestamp": 0.0703458006433024 }, { - "x": 1.4171798685332395, - "y": 5.875868223800632, - "heading": -5.435952596331531e-18, - "angularVelocity": -5.4745324809941165e-17, - "velocityX": 1.0454009191940385, - "velocityY": 0.6768063677097982, + "x": 1.3368350532548872, + "y": 5.824870054295354, + "heading": -1.1732152123508939e-18, + "angularVelocity": -4.190500713042556e-18, + "velocityX": 0.34928371119856133, + "velocityY": 0.2353925640057047, "moduleForcesX": [ - 129.5566105049994, - 129.5566105049994, - 129.5566105049994, - 129.5566105049994 + 24.868450284311663, + 24.868450284311663, + 24.868450284311663, + 24.868450284311663 ], "moduleForcesY": [ - 83.86197208103674, - 83.86197208103675, - 83.86197208103675, - 83.86197208103675 + 16.666969150986652, + 16.666969150986652, + 16.666969150986652, + 16.666969150986652 ], - "timestamp": 0.1494540799884155 + "timestamp": 0.1406916012866048 }, { - "x": 1.5343582621075589, - "y": 5.951713301284787, - "heading": -3.559490914990246e-18, - "angularVelocity": 2.5110879294160833e-17, - "velocityX": 1.5680855762726977, - "velocityY": 1.0149616188451072, + "x": 1.3737614688390336, + "y": 5.849600513626851, + "heading": -8.879086707316188e-19, + "angularVelocity": 4.055772191701108e-18, + "velocityX": 0.5249270780410362, + "velocityY": 0.35155558832714134, "moduleForcesX": [ - 129.55366911533704, - 129.55366911533704, - 129.55366911533704, - 129.55366911533704 + 24.968564610288205, + 24.968564610288205, + 24.968564610288205, + 24.968564610288205 ], "moduleForcesY": [ - 83.81583986040897, - 83.81583986040896, - 83.81583986040896, - 83.81583986040896 + 16.513142683591933, + 16.513142683591933, + 16.513142683591937, + 16.513142683591937 ], - "timestamp": 0.22418111998262324 + "timestamp": 0.2110374019299072 }, { - "x": 1.6905938423637803, - "y": 6.052804405950281, - "heading": -2.4604216597406123e-18, - "angularVelocity": 1.470778518935674e-17, - "velocityX": 2.0907502862289395, - "velocityY": 1.352804883930505, + "x": 1.4231032595993731, + "y": 5.882409601322181, + "heading": 5.414514826356407e-19, + "angularVelocity": 2.031905445284005e-17, + "velocityX": 0.7014177151886212, + "velocityY": 0.46639724610842614, "moduleForcesX": [ - 129.54872498150345, - 129.54872498150345, - 129.54872498150345, - 129.54872498150345 + 25.089008232702305, + 25.089008232702305, + 25.089008232702305, + 25.089008232702305 ], "moduleForcesY": [ - 83.73851037133478, - 83.73851037133478, - 83.73851037133478, - 83.73851037133478 + 16.325303960019514, + 16.325303960019514, + 16.325303960019514, + 16.325303960019514 ], - "timestamp": 0.298908159976831 + "timestamp": 0.2813832025732096 }, { - "x": 1.885883579349796, - "y": 6.179094424852537, - "heading": -6.519682322534955e-18, - "angularVelocity": -5.432117574150896e-17, - "velocityX": 2.613374449212804, - "velocityY": 1.6900176818452624, + "x": 1.4849334657875368, + "y": 5.923181286660606, + "heading": 2.5157381020641023e-18, + "angularVelocity": 2.80654509842357e-17, + "velocityX": 0.8789466552763101, + "velocityY": 0.5795894703816462, "moduleForcesX": [ - 129.5386749274759, - 129.5386749274759, - 129.5386749274759, - 129.5386749274759 + 25.236608079545896, + 25.236608079545892, + 25.236608079545892, + 25.236608079545892 ], "moduleForcesY": [ - 83.58224151188566, - 83.58224151188566, - 83.58224151188566, - 83.58224151188566 + 16.090828910623408, + 16.090828910623404, + 16.090828910623408, + 16.090828910623408 ], - "timestamp": 0.3736351999710388 + "timestamp": 0.351729003216512 }, { - "x": 2.1202179784698285, - "y": 6.330438339594585, - "heading": -2.3452818094408967e-18, - "angularVelocity": 5.586198132074762e-17, - "velocityX": 3.1358715551780296, - "velocityY": 2.0252898382400213, + "x": 1.5593436243675702, + "y": 5.971766705315821, + "heading": 3.5886215678729e-18, + "angularVelocity": 1.5251563795781077e-17, + "velocityX": 1.0577768381276729, + "velocityY": 0.6906655153671165, "moduleForcesX": [ - 129.50718231959343, - 129.50718231959343, - 129.50718231959343, - 129.50718231959343 + 25.421586109758668, + 25.421586109758664, + 25.421586109758664, + 25.421586109758664 ], "moduleForcesY": [ - 83.10123020621896, - 83.10123020621897, - 83.10123020621896, - 83.10123020621896 + 15.790003663288436, + 15.790003663288436, + 15.790003663288436, + 15.790003663288436 ], - "timestamp": 0.44836223996524655 + "timestamp": 0.42207480385981444 }, { - "x": 2.3695422897157243, - "y": 6.463315805616636, - "heading": -9.603464070216514e-18, - "angularVelocity": -9.712926219089962e-17, - "velocityX": 3.3364671110178037, - "velocityY": 1.778171141694658, + "x": 1.6464516739710031, + "y": 6.027968050816977, + "heading": 4.513051815429849e-18, + "angularVelocity": 1.314122861017858e-17, + "velocityX": 1.2382835763733289, + "velocityY": 0.7989296445160439, "moduleForcesX": [ - 49.72001744325625, - 49.72001744325624, - 49.72001744325625, - 49.720017443256246 + 25.659916668080754, + 25.65991666808075, + 25.659916668080754, + 25.659916668080754 ], "moduleForcesY": [ - -61.251336558045516, - -61.25133655804552, - -61.25133655804552, - -61.25133655804552 + 15.390276058964037, + 15.390276058964037, + 15.390276058964037, + 15.390276058964037 ], - "timestamp": 0.5230892799594543 + "timestamp": 0.49242060450311687 }, { - "x": 2.6345246839348353, - "y": 6.5542058490614155, - "heading": -5.961572354618817e-18, - "angularVelocity": 4.87359291274338e-17, - "velocityX": 3.546004153797529, - "velocityY": 1.2162939071561254, + "x": 1.7464149572310093, + "y": 6.091509997219334, + "heading": 5.809749126084697e-18, + "angularVelocity": 1.8433187187374735e-17, + "velocityX": 1.4210270171901473, + "velocityY": 0.9032798805512077, "moduleForcesX": [ - 51.936272358584965, - 51.936272358584965, - 51.936272358584965, - 51.936272358584965 + 25.97787489027851, + 25.97787489027851, + 25.977874890278507, + 25.97787489027851 ], "moduleForcesY": [ - -139.26802009780678, - -139.26802009780678, - -139.26802009780678, - -139.26802009780678 + 14.833896989002268, + 14.83389698900227, + 14.83389698900227, + 14.833896989002268 ], - "timestamp": 0.597816319953662 + "timestamp": 0.5627664051464193 }, { - "x": 2.8635497639018204, - "y": 6.615780990841627, - "heading": -2.9261917927563848e-18, - "angularVelocity": 4.061957435359305e-17, - "velocityX": 3.0648220508156423, - "velocityY": 0.8240008139633554, + "x": 1.8594529270931357, + "y": 6.1619839165084285, + "heading": 7.087425052942939e-18, + "angularVelocity": 1.816278890303902e-17, + "velocityX": 1.6068900890801139, + "velocityY": 1.0018212692814152, "moduleForcesX": [ - -119.26676268317786, - -119.26676268317786, - -119.26676268317786, - -119.26676268317786 + 26.42134572217176, + 26.42134572217176, + 26.42134572217176, + 26.42134572217176 ], "moduleForcesY": [ - -97.2345541493104, - -97.2345541493104, - -97.23455414931041, - -97.2345541493104 + 14.008140902379465, + 14.008140902379465, + 14.008140902379465, + 14.008140902379465 ], - "timestamp": 0.6725433599478697 + "timestamp": 0.6331122057897217 + }, + { + "x": 1.9858892911510706, + "y": 6.238723454955484, + "heading": 7.410167024483004e-18, + "angularVelocity": 4.587935157796845e-18, + "velocityX": 1.7973548229132739, + "velocityY": 1.0908901134863325, + "moduleForcesX": [ + 27.075494498802637, + 27.075494498802634, + 27.075494498802637, + 27.075494498802637 + ], + "moduleForcesY": [ + 12.661572317095718, + 12.661572317095716, + 12.661572317095718, + 12.661572317095718 + ], + "timestamp": 0.7034580064330241 + }, + { + "x": 2.126230144654136, + "y": 6.320466462154626, + "heading": 6.8035176413156204e-18, + "angularVelocity": -8.623818013241701e-18, + "velocityX": 1.995013948518138, + "velocityY": 1.1620168716769936, + "moduleForcesX": [ + 28.098212515501896, + 28.098212515501896, + 28.098212515501896, + 28.098212515501896 + ], + "moduleForcesY": [ + 10.11101693920846, + 10.11101693920846, + 10.11101693920846, + 10.11101693920846 + ], + "timestamp": 0.7738038070763266 + }, + { + "x": 2.281194942923464, + "y": 6.404110012321501, + "heading": 5.805407290610293e-18, + "angularVelocity": -1.4188627341023632e-17, + "velocityX": 2.2029004837843393, + "velocityY": 1.1890340205380103, + "moduleForcesX": [ + 29.55208887596823, + 29.55208887596823, + 29.55208887596823, + 29.55208887596823 + ], + "moduleForcesY": [ + 3.8406199963535603, + 3.84061999635356, + 3.8406199963535608, + 3.840619996353561 + ], + "timestamp": 0.844149607719629 + }, + { + "x": 2.4481889943278308, + "y": 6.479343745654219, + "heading": 3.9473702123424264e-18, + "angularVelocity": -2.641290682568997e-17, + "velocityX": 2.3739022070575855, + "velocityY": 1.0694843564891865, + "moduleForcesX": [ + 24.308732249751895, + 24.308732249751895, + 24.308732249751895, + 24.308732249751895 + ], + "moduleForcesY": [ + -16.99457010305651, + -16.99457010305651, + -16.99457010305651, + -16.99457010305651 + ], + "timestamp": 0.9144954083629314 + }, + { + "x": 2.6126019291689646, + "y": 6.540085342559096, + "heading": 2.7276819770442517e-18, + "angularVelocity": -1.733846546461857e-17, + "velocityX": 2.3372103713029, + "velocityY": 0.8634715412917783, + "moduleForcesX": [ + -5.215924109064587, + -5.2159241090645905, + -5.215924109064587, + -5.2159241090645905 + ], + "moduleForcesY": [ + -29.28573039377617, + -29.28573039377617, + -29.28573039377617, + -29.28573039377617 + ], + "timestamp": 0.9848412090062338 + }, + { + "x": 2.769459785245878, + "y": 6.5881389975741795, + "heading": 1.943876429469792e-18, + "angularVelocity": -1.1142179634119868e-17, + "velocityX": 2.2298112274289563, + "velocityY": 0.6831062348518384, + "moduleForcesX": [ + -15.26731416684351, + -15.26731416684351, + -15.267314166843509, + -15.267314166843507 + ], + "moduleForcesY": [ + -25.639811444396763, + -25.639811444396763, + -25.639811444396763, + -25.639811444396763 + ], + "timestamp": 1.0551870096495362 + }, + { + "x": 2.9171712454510565, + "y": 6.624575054191664, + "heading": 6.065808716075037e-19, + "angularVelocity": -1.9010311139074354e-17, + "velocityX": 2.099790731705065, + "velocityY": 0.5179563852323907, + "moduleForcesX": [ + -18.483050094656996, + -18.483050094656996, + -18.483050094656996, + -18.483050094656996 + ], + "moduleForcesY": [ + -23.476859756968526, + -23.476859756968526, + -23.476859756968526, + -23.476859756968526 + ], + "timestamp": 1.1255328102928386 }, { "x": 3.055, "y": 6.65, - "heading": 4.551497022885823e-28, - "angularVelocity": 3.915840638373607e-17, - "velocityX": 2.5619941069934735, - "velocityY": 0.457920040203237, + "heading": 8.335652640216542e-28, + "angularVelocity": -8.622844076955147e-18, + "velocityX": 1.9593032318705428, + "velocityY": 0.3614280536411378, + "moduleForcesX": [ + -19.97098597923171, + -19.97098597923171, + -19.97098597923171, + -19.97098597923171 + ], + "moduleForcesY": [ + -22.25126875518133, + -22.25126875518133, + -22.25126875518133, + -22.25126875518133 + ], + "timestamp": 1.195878610936141 + }, + { + "x": 3.1814313339169074, + "y": 6.664755987877147, + "heading": -1.1004771062891844e-18, + "angularVelocity": -1.5791457482918625e-17, + "velocityX": 1.8142449490128492, + "velocityY": 0.21174320988659043, + "moduleForcesX": [ + -20.81535081801863, + -20.81535081801863, + -20.81535081801863, + -20.81535081801863 + ], + "moduleForcesY": [ + -21.479245952110467, + -21.47924595211047, + -21.47924595211047, + -21.47924595211047 + ], + "timestamp": 1.2655667387634775 + }, + { + "x": 3.295686609618947, + "y": 6.671587591434824, + "heading": -1.4859458597187586e-18, + "angularVelocity": -5.531340357779152e-18, + "velocityX": 1.639522817790781, + "velocityY": 0.09803109612309134, + "moduleForcesX": [ + -25.07200819843667, + -25.07200819843667, + -25.07200819843667, + -25.07200819843667 + ], + "moduleForcesY": [ + -16.317286359771227, + -16.317286359771227, + -16.317286359771227, + -16.317286359771227 + ], + "timestamp": 1.335254866590814 + }, + { + "x": 3.3965243083925842, + "y": 6.672843691680041, + "heading": -1.4489914754411392e-18, + "angularVelocity": 5.302823448702736e-19, + "velocityX": 1.4469853318987451, + "velocityY": 0.018024594495232547, + "moduleForcesX": [ + -27.62844861739985, + -27.62844861739985, + -27.62844861739985, + -27.62844861739985 + ], + "moduleForcesY": [ + -11.480650165561594, + -11.480650165561592, + -11.480650165561592, + -11.480650165561592 + ], + "timestamp": 1.4049429944181504 + }, + { + "x": 3.4832833376404224, + "y": 6.670498061296956, + "heading": -1.2237760370588112e-18, + "angularVelocity": 3.231761922346595e-18, + "velocityX": 1.2449614009260586, + "velocityY": -0.03365896683150268, + "moduleForcesX": [ + -28.98971995247646, + -28.98971995247646, + -28.98971995247646, + -28.98971995247646 + ], + "moduleForcesY": [ + -7.41640835219301, + -7.4164083521930095, + -7.41640835219301, + -7.41640835219301 + ], + "timestamp": 1.4746311222454869 + }, + { + "x": 3.555649370221193, + "y": 6.66613273148999, + "heading": -1.0493716507115774e-18, + "angularVelocity": 2.502641287026565e-18, + "velocityX": 1.0384269865890108, + "velocityY": -0.06264093961286099, "moduleForcesX": [ - -124.63194427779116, - -124.63194427779116, - -124.63194427779116, - -124.63194427779116 + -29.636958370982487, + -29.636958370982487, + -29.636958370982487, + -29.636958370982487 ], "moduleForcesY": [ - -90.73751599727565, - -90.73751599727565, - -90.73751599727565, - -90.73751599727565 + -4.158810644643203, + -4.158810644643203, + -4.158810644643203, + -4.158810644643203 ], - "timestamp": 0.7472703999420774 + "timestamp": 1.5443192500728233 }, { - "x": 3.192094573135684, - "y": 6.659633727411542, - "heading": -6.881843604018661e-19, - "angularVelocity": -1.0648534063344639e-17, - "velocityX": 2.12131559873558, - "velocityY": 0.149066266949772, + "x": 3.613500061921325, + "y": 6.660999434485797, + "heading": -8.741229650615924e-19, + "angularVelocity": 2.5147566836979602e-18, + "velocityX": 0.8301369760351082, + "velocityY": -0.07366099742155208, "moduleForcesX": [ - -126.297466137267, - -126.29746613726701, - -126.297466137267, - -126.297466137267 + -29.888880222177118, + -29.888880222177118, + -29.888880222177118, + -29.888880222177118 ], "moduleForcesY": [ - -88.51679452908189, - -88.51679452908189, - -88.5167945290819, - -88.5167945290819 + -1.5813393403242322, + -1.5813393403242322, + -1.5813393403242317, + -1.5813393403242317 ], - "timestamp": 0.8118975460442881 + "timestamp": 1.6140073779001598 }, { - "x": 3.296050891017782, - "y": 6.658686872594321, - "heading": -7.611429741725565e-19, - "angularVelocity": -1.1289158342022517e-18, - "velocityX": 1.608554982910472, - "velocityY": -0.014651038760494867, + "x": 3.6568155147422368, + "y": 6.656092256627107, + "heading": -7.076522162639377e-19, + "angularVelocity": 2.3887963927494805e-18, + "velocityX": 0.6215614362353551, + "velocityY": -0.07041626761504745, "moduleForcesX": [ - -146.95603552283006, - -146.95603552283006, - -146.95603552283006, - -146.95603552283006 + -29.92985265962839, + -29.92985265962839, + -29.92985265962839, + -29.92985265962839 ], "moduleForcesY": [ - -46.92101041135018, - -46.92101041135018, - -46.92101041135019, - -46.921010411350196 + 0.46560725731418157, + 0.46560725731418157, + 0.4656072573141819, + 0.4656072573141819 ], - "timestamp": 0.8765246921464988 + "timestamp": 1.6836955057274963 }, { - "x": 3.3654207140290744, - "y": 6.653946573504968, - "heading": -5.563481650910914e-19, - "angularVelocity": 3.1688667062211555e-18, - "velocityX": 1.0733852133179627, - "velocityY": -0.07334842046802804, + "x": 3.685628966750329, + "y": 6.652209311397873, + "heading": -4.082030012181075e-19, + "angularVelocity": 4.296990376586581e-18, + "velocityX": 0.413462850938996, + "velocityY": -0.05571889144239458, "moduleForcesX": [ - -153.37844842944398, - -153.37844842944398, - -153.37844842944398, - -153.37844842944398 + -29.86141137439606, + -29.86141137439606, + -29.86141137439606, + -29.86141137439606 ], "moduleForcesY": [ - -16.822537154943202, - -16.822537154943202, - -16.822537154943202, - -16.822537154943202 + 2.109021526459712, + 2.109021526459712, + 2.109021526459712, + 2.109021526459712 ], - "timestamp": 0.9411518382487094 + "timestamp": 1.7533836335548327 }, { - "x": 3.4, + "x": 3.7, "y": 6.65, - "heading": -7.033779537072183e-28, - "angularVelocity": 8.608583151709574e-18, - "velocityX": 0.5350582233213305, - "velocityY": -0.06106680771961199, + "heading": -9.02675873978704e-28, + "angularVelocity": 5.857568751482333e-18, + "velocityX": 0.2062192470613877, + "velocityY": -0.03170283758154894, "moduleForcesX": [ - -154.28330067343808, - -154.28330067343808, - -154.28330067343808, - -154.28330067343808 + -29.738724563111752, + -29.738724563111752, + -29.738724563111752, + -29.738724563111752 ], "moduleForcesY": [ - 3.519882501953871, - 3.519882501953871, - 3.519882501953872, - 3.519882501953872 + 3.4462188337659563, + 3.4462188337659563, + 3.4462188337659567, + 3.4462188337659567 ], - "timestamp": 1.0057789843509202 + "timestamp": 1.8230717613821692 }, { - "x": 3.4, + "x": 3.7, "y": 6.65, - "heading": -3.5042142475471775e-28, - "angularVelocity": 3.922661717743292e-29, - "velocityX": -5.1140348732094056e-18, - "velocityY": -5.756019320788242e-18, + "heading": -4.415105957203049e-28, + "angularVelocity": 2.8203774666037473e-28, + "velocityX": -3.282611867241503e-20, + "velocityY": -1.0270964063110816e-19, "moduleForcesX": [ - -153.3464795198109, - -153.3464795198109, - -153.3464795198109, - -153.3464795198109 + -29.591732981022112, + -29.591732981022112, + -29.591732981022112, + -29.591732981022112 ], "moduleForcesY": [ - 17.50160930372655, - 17.501609303726546, - 17.501609303726546, - 17.501609303726546 + 4.549245125381732, + 4.549245125381732, + 4.549245125381732, + 4.549245125381732 ], - "timestamp": 1.070406130453131 + "timestamp": 1.8927598892095057 } ], "eventMarkers": [] diff --git a/src/main/deploy/choreo/ScoreStack2.traj b/src/main/deploy/choreo/ScoreStack2.traj index d00959c..5b416ce 100644 --- a/src/main/deploy/choreo/ScoreStack2.traj +++ b/src/main/deploy/choreo/ScoreStack2.traj @@ -1,11 +1,11 @@ { "samples": [ { - "x": 3.400000000000001, + "x": 3.7, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -9.407546867814934e-17, + "velocityX": -2.1223019497204737e-16, "velocityY": 0, "moduleForcesX": [ 0, @@ -22,17 +22,17 @@ "timestamp": 0 }, { - "x": 3.3297074111184566, + "x": 3.6703591590577123, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -0.7653890649196098, + "velocityX": -0.29792018801620485, "velocityY": 0, "moduleForcesX": [ - -154.36282311992616, - -154.36282311992616, - -154.36282311992616, - -154.36282311992616 + -29.943967716838138, + -29.943967716838138, + -29.943967716838138, + -29.943967716838138 ], "moduleForcesY": [ 0, @@ -40,20 +40,20 @@ 0, 0 ], - "timestamp": 0.0918390294600401 + "timestamp": 0.09949255584078534 }, { - "x": 3.1891336601082934, + "x": 3.611079159545517, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.5306537086365442, + "velocityX": -0.5958234665033081, "velocityY": 0, "moduleForcesX": [ - -154.33772998889862, - -154.33772998889862, - -154.33772998889862, - -154.33772998889862 + -29.942268139521204, + -29.942268139521204, + -29.942268139521204, + -29.942268139521204 ], "moduleForcesY": [ 0, @@ -61,20 +61,20 @@ 0, 0 ], - "timestamp": 0.1836780589200802 + "timestamp": 0.19898511168157068 }, { - "x": 2.9783014144979076, + "x": 3.522162201555006, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -2.2956715331997852, + "velocityX": -0.8937046318550901, "velocityY": 0, "moduleForcesX": [ - -154.2879517739881, - -154.2879517739881, - -154.2879517739881, - -154.2879517739881 + -29.940045547576133, + -29.940045547576133, + -29.940045547576133, + -29.940045547576133 ], "moduleForcesY": [ 0, @@ -82,20 +82,20 @@ 0, 0 ], - "timestamp": 0.27551708838012035 + "timestamp": 0.29847766752235605 }, { - "x": 2.697277204972547, + "x": 3.4036112853033273, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.05996493209254, + "velocityX": -1.191555642031464, "velocityY": 0, "moduleForcesX": [ - -154.1418504031152, - -154.1418504031152, - -154.1418504031152, - -154.1418504031152 + -29.9370146499214, + -29.9370146499214, + -29.9370146499214, + -29.9370146499214 ], "moduleForcesY": [ 0, @@ -103,20 +103,20 @@ 0, 0 ], - "timestamp": 0.3673561178401604 + "timestamp": 0.39797022336314136 }, { - "x": 2.3499999999955428, + "x": 3.255430744528146, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.781368411810337, + "velocityX": -1.489363093781487, "velocityY": 0, "moduleForcesX": [ - -145.4918587705222, - -145.4918587705222, - -145.4918587705222, - -145.4918587705222 + -29.932636591081764, + -29.932636591081764, + -29.932636591081764, + -29.932636591081764 ], "moduleForcesY": [ 0, @@ -124,20 +124,20 @@ 0, 0 ], - "timestamp": 0.4591951473002005 + "timestamp": 0.4974627792039267 }, { - "x": 2.0027227950320547, + "x": 3.0776273893666106, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.7813684118103366, + "velocityX": -1.787102096820726, "velocityY": 0, "moduleForcesX": [ - 7.397478932266691e-14, - 7.397478932266691e-14, - 7.397478932266691e-14, - 7.397478932266691e-14 + -29.92575680894927, + -29.92575680894927, + -29.92575680894927, + -29.92575680894927 ], "moduleForcesY": [ 0, @@ -145,20 +145,20 @@ 0, 0 ], - "timestamp": 0.5510341767602406 + "timestamp": 0.596955335044712 }, { - "x": 1.7216985855048654, + "x": 2.8702134771129013, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.0599649320924875, + "velocityX": -2.084717901774596, "velocityY": 0, "moduleForcesX": [ - 145.4918587705386, - 145.4918587705386, - 145.4918587705386, - 145.4918587705386 + -29.913374165405493, + -29.913374165405493, + -29.913374165405493, + -29.913374165405493 ], "moduleForcesY": [ 0, @@ -166,20 +166,20 @@ 0, 0 ], - "timestamp": 0.6428732062202807 + "timestamp": 0.6964478908854973 }, { - "x": 1.5108663398771738, + "x": 2.63321759850265, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -2.295671533199748, + "velocityX": -2.3820463411279955, "velocityY": 0, "moduleForcesX": [ - 154.14185040311517, - 154.14185040311517, - 154.14185040311517, - 154.14185040311517 + -29.884491039590547, + -29.884491039590547, + -29.884491039590547, + -29.884491039590547 ], "moduleForcesY": [ 0, @@ -187,20 +187,20 @@ 0, 0 ], - "timestamp": 0.7347122356803207 + "timestamp": 0.7959404467262826 }, { - "x": 1.370292588887788, + "x": 2.3667824014974026, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.53065370863651, + "velocityX": -2.677941025353704, "velocityY": 0, "moduleForcesX": [ - 154.2879517739881, - 154.2879517739881, - 154.2879517739881, - 154.2879517739881 + -29.740384263813567, + -29.740384263813567, + -29.740384263813567, + -29.740384263813567 ], "moduleForcesY": [ 0, @@ -208,20 +208,20 @@ 0, 0 ], - "timestamp": 0.8265512651403608 + "timestamp": 0.8954330025670679 }, { - "x": 1.2999999999999985, + "x": 2.129786522887132, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -0.7653890649195804, + "velocityX": -2.382046341127999, "velocityY": 0, "moduleForcesX": [ - 154.33772998889862, - 154.33772998889862, - 154.33772998889862, - 154.33772998889862 + 29.74038426381322, + 29.74038426381322, + 29.74038426381322, + 29.74038426381322 ], "moduleForcesY": [ 0, @@ -229,20 +229,20 @@ 0, 0 ], - "timestamp": 0.9183902946004009 + "timestamp": 0.9949255584078532 }, { - "x": 1.2999999999999994, + "x": 1.9223726106332406, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.5609122905701728e-17, + "velocityX": -2.084717901774599, "velocityY": 0, "moduleForcesX": [ - 154.3628231199262, - 154.3628231199262, - 154.3628231199262, - 154.3628231199262 + 29.88449103959053, + 29.88449103959053, + 29.88449103959053, + 29.88449103959053 ], "moduleForcesY": [ 0, @@ -250,7 +250,154 @@ 0, 0 ], - "timestamp": 1.010229324060441 + "timestamp": 1.0944181142486387 + }, + { + "x": 1.7445692554719296, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.7871020968207303, + "velocityY": 0, + "moduleForcesX": [ + 29.91337416540549, + 29.91337416540549, + 29.91337416540549, + 29.91337416540549 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.193910670089424 + }, + { + "x": 1.5963887146963893, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.4893630937814928, + "velocityY": 0, + "moduleForcesX": [ + 29.925756808949266, + 29.925756808949266, + 29.925756808949266, + 29.925756808949266 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.2934032259302093 + }, + { + "x": 1.4778377984444975, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.1915556420314695, + "velocityY": 0, + "moduleForcesX": [ + 29.93263659108176, + 29.93263659108176, + 29.93263659108176, + 29.93263659108176 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.3928957817709946 + }, + { + "x": 1.388920840454741, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.8937046318550956, + "velocityY": 0, + "moduleForcesX": [ + 29.9370146499214, + 29.9370146499214, + 29.9370146499214, + 29.9370146499214 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.49238833761178 + }, + { + "x": 1.3296408409423432, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.5958234665033137, + "velocityY": 0, + "moduleForcesX": [ + 29.940045547576133, + 29.940045547576133, + 29.940045547576133, + 29.940045547576133 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.5918808934525652 + }, + { + "x": 1.2999999999999998, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.2979201880162081, + "velocityY": 0, + "moduleForcesX": [ + 29.9422681395212, + 29.9422681395212, + 29.9422681395212, + 29.9422681395212 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.6913734492933505 + }, + { + "x": 1.2999999999999998, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.0698355883926944e-16, + "velocityY": 0, + "moduleForcesX": [ + 29.943967716838138, + 29.943967716838138, + 29.943967716838138, + 29.943967716838138 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.7908660051341359 } ], "eventMarkers": [] diff --git a/src/main/deploy/pathplanner/autos/1 Stack.auto b/src/main/deploy/pathplanner/autos/1 Stack.auto index cb03150..4933efe 100644 --- a/src/main/deploy/pathplanner/autos/1 Stack.auto +++ b/src/main/deploy/pathplanner/autos/1 Stack.auto @@ -14,7 +14,7 @@ { "type": "named", "data": { - "name": "Dispense" + "name": "Stack" } } ] diff --git a/team5115.chor b/team5115.chor index e5ee87b..6c8c8d2 100644 --- a/team5115.chor +++ b/team5115.chor @@ -10548,7 +10548,7 @@ "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 10 + "controlIntervalCount": 17 }, { "x": 3.055, @@ -10557,10 +10557,10 @@ "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 5 + "controlIntervalCount": 10 }, { - "x": 3.4, + "x": 3.7, "y": 6.65, "heading": 0, "isInitialGuess": false, @@ -10573,10 +10573,10 @@ { "x": 1.3, "y": 5.8, - "heading": -4.4373002037336325e-28, - "angularVelocity": -6.979617908164501e-29, - "velocityX": -2.27392481912151e-18, - "velocityY": 4.734970755779897e-19, + "heading": -3.9553623409205123e-28, + "angularVelocity": -2.2161963154333182e-28, + "velocityX": -3.020585796791611e-20, + "velocityY": -1.2810143670415845e-21, "moduleForcesX": [ 0, 0, @@ -10592,319 +10592,571 @@ "timestamp": 0 }, { - "x": 1.3390601522355576, - "y": 5.825292487292388, - "heading": -1.3449965190212598e-18, - "angularVelocity": -1.799879286886379e-17, - "velocityX": 0.5227043950701811, - "velocityY": 0.33846499599539814, + "x": 1.3122644109389607, + "y": 5.808311175914892, + "heading": -8.784310841930569e-19, + "angularVelocity": -1.2487327962373592e-17, + "velocityX": 0.1743446065977548, + "velocityY": 0.11814743508336693, + "moduleForcesX": [ + 24.783939482300013, + 24.783939482300013, + 24.783939482300013, + 24.783939482300013 + ], + "moduleForcesY": [ + 16.795236389795175, + 16.795236389795175, + 16.795236389795175, + 16.795236389795175 + ], + "timestamp": 0.0703458006433024 + }, + { + "x": 1.3368350532548872, + "y": 5.824870054295354, + "heading": -1.1732152123508939e-18, + "angularVelocity": -4.190500713042556e-18, + "velocityX": 0.34928371119856133, + "velocityY": 0.2353925640057047, + "moduleForcesX": [ + 24.868450284311663, + 24.868450284311663, + 24.868450284311663, + 24.868450284311663 + ], + "moduleForcesY": [ + 16.666969150986652, + 16.666969150986652, + 16.666969150986652, + 16.666969150986652 + ], + "timestamp": 0.1406916012866048 + }, + { + "x": 1.3737614688390336, + "y": 5.849600513626851, + "heading": -8.879086707316188e-19, + "angularVelocity": 4.055772191701108e-18, + "velocityX": 0.5249270780410362, + "velocityY": 0.35155558832714134, "moduleForcesX": [ - 129.55856141356728, - 129.55856141356728, - 129.55856141356728, - 129.55856141356728 + 24.968564610288205, + 24.968564610288205, + 24.968564610288205, + 24.968564610288205 ], "moduleForcesY": [ - 83.8926138436715, - 83.8926138436715, - 83.89261384367151, - 83.89261384367151 + 16.513142683591933, + 16.513142683591933, + 16.513142683591937, + 16.513142683591937 ], - "timestamp": 0.07472703999420775 + "timestamp": 0.2110374019299072 }, { - "x": 1.4171798685332395, - "y": 5.875868223800632, - "heading": -5.435952596331531e-18, - "angularVelocity": -5.4745324809941165e-17, - "velocityX": 1.0454009191940385, - "velocityY": 0.6768063677097982, + "x": 1.4231032595993731, + "y": 5.882409601322181, + "heading": 5.414514826356407e-19, + "angularVelocity": 2.031905445284005e-17, + "velocityX": 0.7014177151886212, + "velocityY": 0.46639724610842614, "moduleForcesX": [ - 129.5566105049994, - 129.5566105049994, - 129.5566105049994, - 129.5566105049994 + 25.089008232702305, + 25.089008232702305, + 25.089008232702305, + 25.089008232702305 ], "moduleForcesY": [ - 83.86197208103674, - 83.86197208103675, - 83.86197208103675, - 83.86197208103675 + 16.325303960019514, + 16.325303960019514, + 16.325303960019514, + 16.325303960019514 ], - "timestamp": 0.1494540799884155 + "timestamp": 0.2813832025732096 }, { - "x": 1.5343582621075589, - "y": 5.951713301284787, - "heading": -3.559490914990246e-18, - "angularVelocity": 2.5110879294160833e-17, - "velocityX": 1.5680855762726977, - "velocityY": 1.0149616188451072, + "x": 1.4849334657875368, + "y": 5.923181286660606, + "heading": 2.5157381020641023e-18, + "angularVelocity": 2.80654509842357e-17, + "velocityX": 0.8789466552763101, + "velocityY": 0.5795894703816462, "moduleForcesX": [ - 129.55366911533704, - 129.55366911533704, - 129.55366911533704, - 129.55366911533704 + 25.236608079545896, + 25.236608079545892, + 25.236608079545892, + 25.236608079545892 ], "moduleForcesY": [ - 83.81583986040897, - 83.81583986040896, - 83.81583986040896, - 83.81583986040896 + 16.090828910623408, + 16.090828910623404, + 16.090828910623408, + 16.090828910623408 ], - "timestamp": 0.22418111998262324 + "timestamp": 0.351729003216512 }, { - "x": 1.6905938423637803, - "y": 6.052804405950281, - "heading": -2.4604216597406123e-18, - "angularVelocity": 1.470778518935674e-17, - "velocityX": 2.0907502862289395, - "velocityY": 1.352804883930505, + "x": 1.5593436243675702, + "y": 5.971766705315821, + "heading": 3.5886215678729e-18, + "angularVelocity": 1.5251563795781077e-17, + "velocityX": 1.0577768381276729, + "velocityY": 0.6906655153671165, "moduleForcesX": [ - 129.54872498150345, - 129.54872498150345, - 129.54872498150345, - 129.54872498150345 + 25.421586109758668, + 25.421586109758664, + 25.421586109758664, + 25.421586109758664 ], "moduleForcesY": [ - 83.73851037133478, - 83.73851037133478, - 83.73851037133478, - 83.73851037133478 + 15.790003663288436, + 15.790003663288436, + 15.790003663288436, + 15.790003663288436 ], - "timestamp": 0.298908159976831 + "timestamp": 0.42207480385981444 }, { - "x": 1.885883579349796, - "y": 6.179094424852537, - "heading": -6.519682322534955e-18, - "angularVelocity": -5.432117574150896e-17, - "velocityX": 2.613374449212804, - "velocityY": 1.6900176818452624, + "x": 1.6464516739710031, + "y": 6.027968050816977, + "heading": 4.513051815429849e-18, + "angularVelocity": 1.314122861017858e-17, + "velocityX": 1.2382835763733289, + "velocityY": 0.7989296445160439, "moduleForcesX": [ - 129.5386749274759, - 129.5386749274759, - 129.5386749274759, - 129.5386749274759 + 25.659916668080754, + 25.65991666808075, + 25.659916668080754, + 25.659916668080754 ], "moduleForcesY": [ - 83.58224151188566, - 83.58224151188566, - 83.58224151188566, - 83.58224151188566 + 15.390276058964037, + 15.390276058964037, + 15.390276058964037, + 15.390276058964037 ], - "timestamp": 0.3736351999710388 + "timestamp": 0.49242060450311687 }, { - "x": 2.1202179784698285, - "y": 6.330438339594585, - "heading": -2.3452818094408967e-18, - "angularVelocity": 5.586198132074762e-17, - "velocityX": 3.1358715551780296, - "velocityY": 2.0252898382400213, + "x": 1.7464149572310093, + "y": 6.091509997219334, + "heading": 5.809749126084697e-18, + "angularVelocity": 1.8433187187374735e-17, + "velocityX": 1.4210270171901473, + "velocityY": 0.9032798805512077, "moduleForcesX": [ - 129.50718231959343, - 129.50718231959343, - 129.50718231959343, - 129.50718231959343 + 25.97787489027851, + 25.97787489027851, + 25.977874890278507, + 25.97787489027851 ], "moduleForcesY": [ - 83.10123020621896, - 83.10123020621897, - 83.10123020621896, - 83.10123020621896 + 14.833896989002268, + 14.83389698900227, + 14.83389698900227, + 14.833896989002268 ], - "timestamp": 0.44836223996524655 + "timestamp": 0.5627664051464193 }, { - "x": 2.3695422897157243, - "y": 6.463315805616636, - "heading": -9.603464070216514e-18, - "angularVelocity": -9.712926219089962e-17, - "velocityX": 3.3364671110178037, - "velocityY": 1.778171141694658, + "x": 1.8594529270931357, + "y": 6.1619839165084285, + "heading": 7.087425052942939e-18, + "angularVelocity": 1.816278890303902e-17, + "velocityX": 1.6068900890801139, + "velocityY": 1.0018212692814152, "moduleForcesX": [ - 49.72001744325625, - 49.72001744325624, - 49.72001744325625, - 49.720017443256246 + 26.42134572217176, + 26.42134572217176, + 26.42134572217176, + 26.42134572217176 ], "moduleForcesY": [ - -61.251336558045516, - -61.25133655804552, - -61.25133655804552, - -61.25133655804552 + 14.008140902379465, + 14.008140902379465, + 14.008140902379465, + 14.008140902379465 ], - "timestamp": 0.5230892799594543 + "timestamp": 0.6331122057897217 }, { - "x": 2.6345246839348353, - "y": 6.5542058490614155, - "heading": -5.961572354618817e-18, - "angularVelocity": 4.87359291274338e-17, - "velocityX": 3.546004153797529, - "velocityY": 1.2162939071561254, + "x": 1.9858892911510706, + "y": 6.238723454955484, + "heading": 7.410167024483004e-18, + "angularVelocity": 4.587935157796845e-18, + "velocityX": 1.7973548229132739, + "velocityY": 1.0908901134863325, "moduleForcesX": [ - 51.936272358584965, - 51.936272358584965, - 51.936272358584965, - 51.936272358584965 + 27.075494498802637, + 27.075494498802634, + 27.075494498802637, + 27.075494498802637 ], "moduleForcesY": [ - -139.26802009780678, - -139.26802009780678, - -139.26802009780678, - -139.26802009780678 + 12.661572317095718, + 12.661572317095716, + 12.661572317095718, + 12.661572317095718 ], - "timestamp": 0.597816319953662 + "timestamp": 0.7034580064330241 }, { - "x": 2.8635497639018204, - "y": 6.615780990841627, - "heading": -2.9261917927563848e-18, - "angularVelocity": 4.061957435359305e-17, - "velocityX": 3.0648220508156423, - "velocityY": 0.8240008139633554, + "x": 2.126230144654136, + "y": 6.320466462154626, + "heading": 6.8035176413156204e-18, + "angularVelocity": -8.623818013241701e-18, + "velocityX": 1.995013948518138, + "velocityY": 1.1620168716769936, "moduleForcesX": [ - -119.26676268317786, - -119.26676268317786, - -119.26676268317786, - -119.26676268317786 + 28.098212515501896, + 28.098212515501896, + 28.098212515501896, + 28.098212515501896 ], "moduleForcesY": [ - -97.2345541493104, - -97.2345541493104, - -97.23455414931041, - -97.2345541493104 + 10.11101693920846, + 10.11101693920846, + 10.11101693920846, + 10.11101693920846 ], - "timestamp": 0.6725433599478697 + "timestamp": 0.7738038070763266 + }, + { + "x": 2.281194942923464, + "y": 6.404110012321501, + "heading": 5.805407290610293e-18, + "angularVelocity": -1.4188627341023632e-17, + "velocityX": 2.2029004837843393, + "velocityY": 1.1890340205380103, + "moduleForcesX": [ + 29.55208887596823, + 29.55208887596823, + 29.55208887596823, + 29.55208887596823 + ], + "moduleForcesY": [ + 3.8406199963535603, + 3.84061999635356, + 3.8406199963535608, + 3.840619996353561 + ], + "timestamp": 0.844149607719629 + }, + { + "x": 2.4481889943278308, + "y": 6.479343745654219, + "heading": 3.9473702123424264e-18, + "angularVelocity": -2.641290682568997e-17, + "velocityX": 2.3739022070575855, + "velocityY": 1.0694843564891865, + "moduleForcesX": [ + 24.308732249751895, + 24.308732249751895, + 24.308732249751895, + 24.308732249751895 + ], + "moduleForcesY": [ + -16.99457010305651, + -16.99457010305651, + -16.99457010305651, + -16.99457010305651 + ], + "timestamp": 0.9144954083629314 + }, + { + "x": 2.6126019291689646, + "y": 6.540085342559096, + "heading": 2.7276819770442517e-18, + "angularVelocity": -1.733846546461857e-17, + "velocityX": 2.3372103713029, + "velocityY": 0.8634715412917783, + "moduleForcesX": [ + -5.215924109064587, + -5.2159241090645905, + -5.215924109064587, + -5.2159241090645905 + ], + "moduleForcesY": [ + -29.28573039377617, + -29.28573039377617, + -29.28573039377617, + -29.28573039377617 + ], + "timestamp": 0.9848412090062338 + }, + { + "x": 2.769459785245878, + "y": 6.5881389975741795, + "heading": 1.943876429469792e-18, + "angularVelocity": -1.1142179634119868e-17, + "velocityX": 2.2298112274289563, + "velocityY": 0.6831062348518384, + "moduleForcesX": [ + -15.26731416684351, + -15.26731416684351, + -15.267314166843509, + -15.267314166843507 + ], + "moduleForcesY": [ + -25.639811444396763, + -25.639811444396763, + -25.639811444396763, + -25.639811444396763 + ], + "timestamp": 1.0551870096495362 + }, + { + "x": 2.9171712454510565, + "y": 6.624575054191664, + "heading": 6.065808716075037e-19, + "angularVelocity": -1.9010311139074354e-17, + "velocityX": 2.099790731705065, + "velocityY": 0.5179563852323907, + "moduleForcesX": [ + -18.483050094656996, + -18.483050094656996, + -18.483050094656996, + -18.483050094656996 + ], + "moduleForcesY": [ + -23.476859756968526, + -23.476859756968526, + -23.476859756968526, + -23.476859756968526 + ], + "timestamp": 1.1255328102928386 }, { "x": 3.055, "y": 6.65, - "heading": 4.551497022885823e-28, - "angularVelocity": 3.915840638373607e-17, - "velocityX": 2.5619941069934735, - "velocityY": 0.457920040203237, + "heading": 8.335652640216542e-28, + "angularVelocity": -8.622844076955147e-18, + "velocityX": 1.9593032318705428, + "velocityY": 0.3614280536411378, "moduleForcesX": [ - -124.63194427779116, - -124.63194427779116, - -124.63194427779116, - -124.63194427779116 + -19.97098597923171, + -19.97098597923171, + -19.97098597923171, + -19.97098597923171 ], "moduleForcesY": [ - -90.73751599727565, - -90.73751599727565, - -90.73751599727565, - -90.73751599727565 + -22.25126875518133, + -22.25126875518133, + -22.25126875518133, + -22.25126875518133 ], - "timestamp": 0.7472703999420774 + "timestamp": 1.195878610936141 }, { - "x": 3.192094573135684, - "y": 6.659633727411542, - "heading": -6.881843604018661e-19, - "angularVelocity": -1.0648534063344639e-17, - "velocityX": 2.12131559873558, - "velocityY": 0.149066266949772, + "x": 3.1814313339169074, + "y": 6.664755987877147, + "heading": -1.1004771062891844e-18, + "angularVelocity": -1.5791457482918625e-17, + "velocityX": 1.8142449490128492, + "velocityY": 0.21174320988659043, "moduleForcesX": [ - -126.297466137267, - -126.29746613726701, - -126.297466137267, - -126.297466137267 + -20.81535081801863, + -20.81535081801863, + -20.81535081801863, + -20.81535081801863 ], "moduleForcesY": [ - -88.51679452908189, - -88.51679452908189, - -88.5167945290819, - -88.5167945290819 + -21.479245952110467, + -21.47924595211047, + -21.47924595211047, + -21.47924595211047 ], - "timestamp": 0.8118975460442881 + "timestamp": 1.2655667387634775 }, { - "x": 3.296050891017782, - "y": 6.658686872594321, - "heading": -7.611429741725565e-19, - "angularVelocity": -1.1289158342022517e-18, - "velocityX": 1.608554982910472, - "velocityY": -0.014651038760494867, + "x": 3.295686609618947, + "y": 6.671587591434824, + "heading": -1.4859458597187586e-18, + "angularVelocity": -5.531340357779152e-18, + "velocityX": 1.639522817790781, + "velocityY": 0.09803109612309134, "moduleForcesX": [ - -146.95603552283006, - -146.95603552283006, - -146.95603552283006, - -146.95603552283006 + -25.07200819843667, + -25.07200819843667, + -25.07200819843667, + -25.07200819843667 ], "moduleForcesY": [ - -46.92101041135018, - -46.92101041135018, - -46.92101041135019, - -46.921010411350196 + -16.317286359771227, + -16.317286359771227, + -16.317286359771227, + -16.317286359771227 ], - "timestamp": 0.8765246921464988 + "timestamp": 1.335254866590814 }, { - "x": 3.3654207140290744, - "y": 6.653946573504968, - "heading": -5.563481650910914e-19, - "angularVelocity": 3.1688667062211555e-18, - "velocityX": 1.0733852133179627, - "velocityY": -0.07334842046802804, + "x": 3.3965243083925842, + "y": 6.672843691680041, + "heading": -1.4489914754411392e-18, + "angularVelocity": 5.302823448702736e-19, + "velocityX": 1.4469853318987451, + "velocityY": 0.018024594495232547, "moduleForcesX": [ - -153.37844842944398, - -153.37844842944398, - -153.37844842944398, - -153.37844842944398 + -27.62844861739985, + -27.62844861739985, + -27.62844861739985, + -27.62844861739985 ], "moduleForcesY": [ - -16.822537154943202, - -16.822537154943202, - -16.822537154943202, - -16.822537154943202 + -11.480650165561594, + -11.480650165561592, + -11.480650165561592, + -11.480650165561592 ], - "timestamp": 0.9411518382487094 + "timestamp": 1.4049429944181504 }, { - "x": 3.4, + "x": 3.4832833376404224, + "y": 6.670498061296956, + "heading": -1.2237760370588112e-18, + "angularVelocity": 3.231761922346595e-18, + "velocityX": 1.2449614009260586, + "velocityY": -0.03365896683150268, + "moduleForcesX": [ + -28.98971995247646, + -28.98971995247646, + -28.98971995247646, + -28.98971995247646 + ], + "moduleForcesY": [ + -7.41640835219301, + -7.4164083521930095, + -7.41640835219301, + -7.41640835219301 + ], + "timestamp": 1.4746311222454869 + }, + { + "x": 3.555649370221193, + "y": 6.66613273148999, + "heading": -1.0493716507115774e-18, + "angularVelocity": 2.502641287026565e-18, + "velocityX": 1.0384269865890108, + "velocityY": -0.06264093961286099, + "moduleForcesX": [ + -29.636958370982487, + -29.636958370982487, + -29.636958370982487, + -29.636958370982487 + ], + "moduleForcesY": [ + -4.158810644643203, + -4.158810644643203, + -4.158810644643203, + -4.158810644643203 + ], + "timestamp": 1.5443192500728233 + }, + { + "x": 3.613500061921325, + "y": 6.660999434485797, + "heading": -8.741229650615924e-19, + "angularVelocity": 2.5147566836979602e-18, + "velocityX": 0.8301369760351082, + "velocityY": -0.07366099742155208, + "moduleForcesX": [ + -29.888880222177118, + -29.888880222177118, + -29.888880222177118, + -29.888880222177118 + ], + "moduleForcesY": [ + -1.5813393403242322, + -1.5813393403242322, + -1.5813393403242317, + -1.5813393403242317 + ], + "timestamp": 1.6140073779001598 + }, + { + "x": 3.6568155147422368, + "y": 6.656092256627107, + "heading": -7.076522162639377e-19, + "angularVelocity": 2.3887963927494805e-18, + "velocityX": 0.6215614362353551, + "velocityY": -0.07041626761504745, + "moduleForcesX": [ + -29.92985265962839, + -29.92985265962839, + -29.92985265962839, + -29.92985265962839 + ], + "moduleForcesY": [ + 0.46560725731418157, + 0.46560725731418157, + 0.4656072573141819, + 0.4656072573141819 + ], + "timestamp": 1.6836955057274963 + }, + { + "x": 3.685628966750329, + "y": 6.652209311397873, + "heading": -4.082030012181075e-19, + "angularVelocity": 4.296990376586581e-18, + "velocityX": 0.413462850938996, + "velocityY": -0.05571889144239458, + "moduleForcesX": [ + -29.86141137439606, + -29.86141137439606, + -29.86141137439606, + -29.86141137439606 + ], + "moduleForcesY": [ + 2.109021526459712, + 2.109021526459712, + 2.109021526459712, + 2.109021526459712 + ], + "timestamp": 1.7533836335548327 + }, + { + "x": 3.7, "y": 6.65, - "heading": -7.033779537072183e-28, - "angularVelocity": 8.608583151709574e-18, - "velocityX": 0.5350582233213305, - "velocityY": -0.06106680771961199, + "heading": -9.02675873978704e-28, + "angularVelocity": 5.857568751482333e-18, + "velocityX": 0.2062192470613877, + "velocityY": -0.03170283758154894, "moduleForcesX": [ - -154.28330067343808, - -154.28330067343808, - -154.28330067343808, - -154.28330067343808 + -29.738724563111752, + -29.738724563111752, + -29.738724563111752, + -29.738724563111752 ], "moduleForcesY": [ - 3.519882501953871, - 3.519882501953871, - 3.519882501953872, - 3.519882501953872 + 3.4462188337659563, + 3.4462188337659563, + 3.4462188337659567, + 3.4462188337659567 ], - "timestamp": 1.0057789843509202 + "timestamp": 1.8230717613821692 }, { - "x": 3.4, + "x": 3.7, "y": 6.65, - "heading": -3.5042142475471775e-28, - "angularVelocity": 3.922661717743292e-29, - "velocityX": -5.1140348732094056e-18, - "velocityY": -5.756019320788242e-18, + "heading": -4.415105957203049e-28, + "angularVelocity": 2.8203774666037473e-28, + "velocityX": -3.282611867241503e-20, + "velocityY": -1.0270964063110816e-19, "moduleForcesX": [ - -153.3464795198109, - -153.3464795198109, - -153.3464795198109, - -153.3464795198109 + -29.591732981022112, + -29.591732981022112, + -29.591732981022112, + -29.591732981022112 ], "moduleForcesY": [ - 17.50160930372655, - 17.501609303726546, - 17.501609303726546, - 17.501609303726546 + 4.549245125381732, + 4.549245125381732, + 4.549245125381732, + 4.549245125381732 ], - "timestamp": 1.070406130453131 + "timestamp": 1.8927598892095057 } ], "trajectoryWaypoints": [ @@ -10917,10 +11169,10 @@ "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 10 + "controlIntervalCount": 17 }, { - "timestamp": 0.7472703999420774, + "timestamp": 1.195878610936141, "isStopPoint": false, "x": 3.055, "y": 6.65, @@ -10928,12 +11180,12 @@ "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 5 + "controlIntervalCount": 10 }, { - "timestamp": 1.070406130453131, + "timestamp": 1.8927598892095057, "isStopPoint": true, - "x": 3.4, + "x": 3.7, "y": 6.65, "heading": 0, "isInitialGuess": false, @@ -10972,13 +11224,13 @@ "ScoreStack2": { "waypoints": [ { - "x": 3.4, + "x": 3.7, "y": 6.65, "heading": 0, "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 11 + "controlIntervalCount": 18 }, { "x": 1.3, @@ -10992,11 +11244,11 @@ ], "trajectory": [ { - "x": 3.400000000000001, + "x": 3.7, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -9.407546867814934e-17, + "velocityX": -2.1223019497204737e-16, "velocityY": 0, "moduleForcesX": [ 0, @@ -11013,17 +11265,17 @@ "timestamp": 0 }, { - "x": 3.3297074111184566, + "x": 3.6703591590577123, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -0.7653890649196098, + "velocityX": -0.29792018801620485, "velocityY": 0, "moduleForcesX": [ - -154.36282311992616, - -154.36282311992616, - -154.36282311992616, - -154.36282311992616 + -29.943967716838138, + -29.943967716838138, + -29.943967716838138, + -29.943967716838138 ], "moduleForcesY": [ 0, @@ -11031,20 +11283,20 @@ 0, 0 ], - "timestamp": 0.0918390294600401 + "timestamp": 0.09949255584078534 }, { - "x": 3.1891336601082934, + "x": 3.611079159545517, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.5306537086365442, + "velocityX": -0.5958234665033081, "velocityY": 0, "moduleForcesX": [ - -154.33772998889862, - -154.33772998889862, - -154.33772998889862, - -154.33772998889862 + -29.942268139521204, + -29.942268139521204, + -29.942268139521204, + -29.942268139521204 ], "moduleForcesY": [ 0, @@ -11052,20 +11304,20 @@ 0, 0 ], - "timestamp": 0.1836780589200802 + "timestamp": 0.19898511168157068 }, { - "x": 2.9783014144979076, + "x": 3.522162201555006, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -2.2956715331997852, + "velocityX": -0.8937046318550901, "velocityY": 0, "moduleForcesX": [ - -154.2879517739881, - -154.2879517739881, - -154.2879517739881, - -154.2879517739881 + -29.940045547576133, + -29.940045547576133, + -29.940045547576133, + -29.940045547576133 ], "moduleForcesY": [ 0, @@ -11073,20 +11325,20 @@ 0, 0 ], - "timestamp": 0.27551708838012035 + "timestamp": 0.29847766752235605 }, { - "x": 2.697277204972547, + "x": 3.4036112853033273, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.05996493209254, + "velocityX": -1.191555642031464, "velocityY": 0, "moduleForcesX": [ - -154.1418504031152, - -154.1418504031152, - -154.1418504031152, - -154.1418504031152 + -29.9370146499214, + -29.9370146499214, + -29.9370146499214, + -29.9370146499214 ], "moduleForcesY": [ 0, @@ -11094,20 +11346,20 @@ 0, 0 ], - "timestamp": 0.3673561178401604 + "timestamp": 0.39797022336314136 }, { - "x": 2.3499999999955428, + "x": 3.255430744528146, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.781368411810337, + "velocityX": -1.489363093781487, "velocityY": 0, "moduleForcesX": [ - -145.4918587705222, - -145.4918587705222, - -145.4918587705222, - -145.4918587705222 + -29.932636591081764, + -29.932636591081764, + -29.932636591081764, + -29.932636591081764 ], "moduleForcesY": [ 0, @@ -11115,20 +11367,20 @@ 0, 0 ], - "timestamp": 0.4591951473002005 + "timestamp": 0.4974627792039267 }, { - "x": 2.0027227950320547, + "x": 3.0776273893666106, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.7813684118103366, + "velocityX": -1.787102096820726, "velocityY": 0, "moduleForcesX": [ - 7.397478932266691e-14, - 7.397478932266691e-14, - 7.397478932266691e-14, - 7.397478932266691e-14 + -29.92575680894927, + -29.92575680894927, + -29.92575680894927, + -29.92575680894927 ], "moduleForcesY": [ 0, @@ -11136,20 +11388,20 @@ 0, 0 ], - "timestamp": 0.5510341767602406 + "timestamp": 0.596955335044712 }, { - "x": 1.7216985855048654, + "x": 2.8702134771129013, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -3.0599649320924875, + "velocityX": -2.084717901774596, "velocityY": 0, "moduleForcesX": [ - 145.4918587705386, - 145.4918587705386, - 145.4918587705386, - 145.4918587705386 + -29.913374165405493, + -29.913374165405493, + -29.913374165405493, + -29.913374165405493 ], "moduleForcesY": [ 0, @@ -11157,20 +11409,20 @@ 0, 0 ], - "timestamp": 0.6428732062202807 + "timestamp": 0.6964478908854973 }, { - "x": 1.5108663398771738, + "x": 2.63321759850265, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -2.295671533199748, + "velocityX": -2.3820463411279955, "velocityY": 0, "moduleForcesX": [ - 154.14185040311517, - 154.14185040311517, - 154.14185040311517, - 154.14185040311517 + -29.884491039590547, + -29.884491039590547, + -29.884491039590547, + -29.884491039590547 ], "moduleForcesY": [ 0, @@ -11178,20 +11430,20 @@ 0, 0 ], - "timestamp": 0.7347122356803207 + "timestamp": 0.7959404467262826 }, { - "x": 1.370292588887788, + "x": 2.3667824014974026, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.53065370863651, + "velocityX": -2.677941025353704, "velocityY": 0, "moduleForcesX": [ - 154.2879517739881, - 154.2879517739881, - 154.2879517739881, - 154.2879517739881 + -29.740384263813567, + -29.740384263813567, + -29.740384263813567, + -29.740384263813567 ], "moduleForcesY": [ 0, @@ -11199,20 +11451,20 @@ 0, 0 ], - "timestamp": 0.8265512651403608 + "timestamp": 0.8954330025670679 }, { - "x": 1.2999999999999985, + "x": 2.129786522887132, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -0.7653890649195804, + "velocityX": -2.382046341127999, "velocityY": 0, "moduleForcesX": [ - 154.33772998889862, - 154.33772998889862, - 154.33772998889862, - 154.33772998889862 + 29.74038426381322, + 29.74038426381322, + 29.74038426381322, + 29.74038426381322 ], "moduleForcesY": [ 0, @@ -11220,20 +11472,20 @@ 0, 0 ], - "timestamp": 0.9183902946004009 + "timestamp": 0.9949255584078532 }, { - "x": 1.2999999999999994, + "x": 1.9223726106332406, "y": 6.65, "heading": 0, "angularVelocity": 0, - "velocityX": -1.5609122905701728e-17, + "velocityX": -2.084717901774599, "velocityY": 0, "moduleForcesX": [ - 154.3628231199262, - 154.3628231199262, - 154.3628231199262, - 154.3628231199262 + 29.88449103959053, + 29.88449103959053, + 29.88449103959053, + 29.88449103959053 ], "moduleForcesY": [ 0, @@ -11241,23 +11493,170 @@ 0, 0 ], - "timestamp": 1.010229324060441 + "timestamp": 1.0944181142486387 + }, + { + "x": 1.7445692554719296, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.7871020968207303, + "velocityY": 0, + "moduleForcesX": [ + 29.91337416540549, + 29.91337416540549, + 29.91337416540549, + 29.91337416540549 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.193910670089424 + }, + { + "x": 1.5963887146963893, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.4893630937814928, + "velocityY": 0, + "moduleForcesX": [ + 29.925756808949266, + 29.925756808949266, + 29.925756808949266, + 29.925756808949266 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.2934032259302093 + }, + { + "x": 1.4778377984444975, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.1915556420314695, + "velocityY": 0, + "moduleForcesX": [ + 29.93263659108176, + 29.93263659108176, + 29.93263659108176, + 29.93263659108176 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.3928957817709946 + }, + { + "x": 1.388920840454741, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.8937046318550956, + "velocityY": 0, + "moduleForcesX": [ + 29.9370146499214, + 29.9370146499214, + 29.9370146499214, + 29.9370146499214 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.49238833761178 + }, + { + "x": 1.3296408409423432, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.5958234665033137, + "velocityY": 0, + "moduleForcesX": [ + 29.940045547576133, + 29.940045547576133, + 29.940045547576133, + 29.940045547576133 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.5918808934525652 + }, + { + "x": 1.2999999999999998, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -0.2979201880162081, + "velocityY": 0, + "moduleForcesX": [ + 29.9422681395212, + 29.9422681395212, + 29.9422681395212, + 29.9422681395212 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.6913734492933505 + }, + { + "x": 1.2999999999999998, + "y": 6.65, + "heading": 0, + "angularVelocity": 0, + "velocityX": -1.0698355883926944e-16, + "velocityY": 0, + "moduleForcesX": [ + 29.943967716838138, + 29.943967716838138, + 29.943967716838138, + 29.943967716838138 + ], + "moduleForcesY": [ + 0, + 0, + 0, + 0 + ], + "timestamp": 1.7908660051341359 } ], "trajectoryWaypoints": [ { "timestamp": 0, "isStopPoint": true, - "x": 3.4, + "x": 3.7, "y": 6.65, "heading": 0, "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 11 + "controlIntervalCount": 18 }, { - "timestamp": 1.010229324060441, + "timestamp": 1.7908660051341359, "isStopPoint": true, "x": 1.3, "y": 6.65,