From a0b9295f7f3a9c9d4e38741c8488f80ec161c582 Mon Sep 17 00:00:00 2001 From: belowAverageCoder5188 <146988904+belowAverageCoder5188@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:54:20 -0700 Subject: [PATCH] Fix: Made the one true SourceLanehgfedChaos auto claim its throne --- .../deploy/choreo/SourceLanehgfedChaos.1.traj | 914 ------------------ .../deploy/choreo/SourceLanehgfedChaos.traj | 914 ------------------ .../commands/autos/SourceLanehgfedChaos.java | 12 +- .../commands/autos/SourceLanehgfedChaos2.java | 18 - 4 files changed, 6 insertions(+), 1852 deletions(-) delete mode 100644 src/main/deploy/choreo/SourceLanehgfedChaos.1.traj delete mode 100644 src/main/deploy/choreo/SourceLanehgfedChaos.traj delete mode 100644 src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos2.java diff --git a/src/main/deploy/choreo/SourceLanehgfedChaos.1.traj b/src/main/deploy/choreo/SourceLanehgfedChaos.1.traj deleted file mode 100644 index ad6a507..0000000 --- a/src/main/deploy/choreo/SourceLanehgfedChaos.1.traj +++ /dev/null @@ -1,914 +0,0 @@ -{ - "samples": [ - { - "x": 1.351629376411438, - "y": 1.5909570455551147, - "heading": 1.6862047834588912e-26, - "angularVelocity": 6.3647901274820834e-27, - "velocityX": 4.986194855238315e-27, - "velocityY": -6.2765729904834755e-28, - "timestamp": 0 - }, - { - "x": 1.4098407784450662, - "y": 1.5833792294289561, - "heading": -0.010593951823815846, - "angularVelocity": -0.10883093955766905, - "velocityX": 0.5980017354852467, - "velocityY": -0.07784638466555155, - "timestamp": 0.09734319915709407 - }, - { - "x": 1.5262696008571386, - "y": 1.5682228137234184, - "heading": -0.03122579099456415, - "angularVelocity": -0.21194946693145247, - "velocityX": 1.196065297013483, - "velocityY": -0.1557008176922354, - "timestamp": 0.19468639831418813 - }, - { - "x": 1.7009243165309464, - "y": 1.5454866954595423, - "heading": -0.06105764336616573, - "angularVelocity": -0.30646057074268174, - "velocityX": 1.794215899889905, - "velocityY": -0.23356658154602322, - "timestamp": 0.2920295974712822 - }, - { - "x": 1.9338175006021991, - "y": 1.5151692376373096, - "heading": -0.09868568267417419, - "angularVelocity": -0.386550263745531, - "velocityX": 2.392495686271887, - "velocityY": -0.3114491621885752, - "timestamp": 0.38937279662837626 - }, - { - "x": 2.2249683008322316, - "y": 1.4772679476485795, - "heading": -0.1412661608706324, - "angularVelocity": -0.43742632834309375, - "velocityX": 2.990972176291112, - "velocityY": -0.38935734922338544, - "timestamp": 0.4867159957854703 - }, - { - "x": 2.5743813690719564, - "y": 1.4317822199269228, - "heading": -0.17988502274771773, - "angularVelocity": -0.39672891595397014, - "velocityX": 3.589496454455294, - "velocityY": -0.46727175720053415, - "timestamp": 0.5840591949425644 - }, - { - "x": 2.9339510004802603, - "y": 1.3849743359699507, - "heading": -0.17988503154826246, - "angularVelocity": -9.040739168662314e-8, - "velocityX": 3.6938341303949174, - "velocityY": -0.48085417740825276, - "timestamp": 0.6814023940996585 - }, - { - "x": 3.293520631888573, - "y": 1.338166452012977, - "heading": -0.1798850403487868, - "angularVelocity": -9.04071820339056e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 0.7787455932567526 - }, - { - "x": 3.6530902632968862, - "y": 1.2913585680560036, - "heading": -0.17988504914931117, - "angularVelocity": -9.040718252069144e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 0.8760887924138467 - }, - { - "x": 4.0126598947052, - "y": 1.2445506840990304, - "heading": -0.17988505794983556, - "angularVelocity": -9.040718271704664e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 0.9734319915709408 - }, - { - "x": 4.372229526113513, - "y": 1.197742800142057, - "heading": -0.1798850667503599, - "angularVelocity": -9.040718230350781e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.070775190728035 - }, - { - "x": 4.7317991575218254, - "y": 1.1509349161850833, - "heading": -0.17988507555088423, - "angularVelocity": -9.040718209591692e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.168118389885129 - }, - { - "x": 5.091368788930138, - "y": 1.1041270322281096, - "heading": -0.1798850843514086, - "angularVelocity": -9.040718222578003e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.2654615890422232 - }, - { - "x": 5.450938420338452, - "y": 1.0573191482711366, - "heading": -0.179885093151933, - "angularVelocity": -9.040718271874344e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.3628047881993173 - }, - { - "x": 5.810508051746765, - "y": 1.0105112643141632, - "heading": -0.17988510195245733, - "angularVelocity": -9.040718207825685e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.4601479873564114 - }, - { - "x": 6.170077683155077, - "y": 0.9637033803571897, - "heading": -0.17988511075298164, - "angularVelocity": -9.04071820559312e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.5574911865135055 - }, - { - "x": 6.529647314563391, - "y": 0.9168954964002163, - "heading": -0.17988511955350583, - "angularVelocity": -9.040718096164527e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.6548343856705996 - }, - { - "x": 6.889216945971645, - "y": 0.8700876124432507, - "heading": -0.1798851283540626, - "angularVelocity": -9.04075151499357e-8, - "velocityX": 3.69383413039441, - "velocityY": -0.48085417740818676, - "timestamp": 1.7521775848276937 - }, - { - "x": 7.209691958187603, - "y": 0.8283689691747375, - "heading": -0.18458655717583616, - "angularVelocity": -0.04829745542044847, - "velocityX": 3.2922177922134055, - "velocityY": -0.42857275731391337, - "timestamp": 1.8495207839847878 - }, - { - "x": 7.471997908032522, - "y": 0.7942226303599829, - "heading": -0.17541534915765347, - "angularVelocity": 0.0942151901478197, - "velocityX": 2.6946510091743066, - "velocityY": -0.3507829936804171, - "timestamp": 1.946863983141882 - }, - { - "x": 7.676134768878821, - "y": 0.7676485994652997, - "heading": -0.15237304219148237, - "angularVelocity": 0.23671203705751462, - "velocityX": 2.097083952591902, - "velocityY": -0.2729931944377309, - "timestamp": 2.044207182298976 - }, - { - "x": 7.822102528983219, - "y": 0.7486468780193989, - "heading": -0.11546022153411278, - "angularVelocity": 0.37920287166439925, - "velocityX": 1.499516775371568, - "velocityY": -0.19520337949069788, - "timestamp": 2.14155038145607 - }, - { - "x": 7.909901201272586, - "y": 0.7372174643394926, - "heading": -0.0646733025478063, - "angularVelocity": 0.5217305310085989, - "velocityX": 0.9019497309480833, - "velocityY": -0.11741358183082976, - "timestamp": 2.238893580613164 - }, - { - "x": 7.939530849456787, - "y": 0.7333603501319885, - "heading": -2.1258841512221986e-26, - "angularVelocity": 0.6643843957032423, - "velocityX": 0.3043833410116731, - "velocityY": -0.03962386937046781, - "timestamp": 2.3362367797702577 - }, - { - "x": 7.936937891558933, - "y": 0.7420288327845614, - "heading": 0.047244903822912916, - "angularVelocity": 0.7525872009191306, - "velocityX": -0.04130449569252893, - "velocityY": 0.13808450367829891, - "timestamp": 2.399013430456335 - }, - { - "x": 7.912801567759522, - "y": 0.7621552551197827, - "heading": 0.10003244844139744, - "angularVelocity": 0.8408786394555429, - "velocityX": -0.3844793173198744, - "velocityY": 0.3206036339190191, - "timestamp": 2.4617900811424125 - }, - { - "x": 7.8673509529868335, - "y": 0.7941607762713011, - "heading": 0.15836683953243252, - "angularVelocity": 0.9292370722793692, - "velocityX": -0.7240050922750012, - "velocityY": 0.5098316141707855, - "timestamp": 2.52456673182849 - }, - { - "x": 7.800947406113619, - "y": 0.8386725592749237, - "heading": 0.22224423895016934, - "angularVelocity": 1.0175343653990714, - "velocityX": -1.057774604849075, - "velocityY": 0.7090499814367216, - "timestamp": 2.5873433825145673 - }, - { - "x": 7.714239225150062, - "y": 0.8967193983348688, - "heading": 0.2916317494080749, - "angularVelocity": 1.1053076215372926, - "velocityX": -1.3812170610559127, - "velocityY": 0.9246565152100241, - "timestamp": 2.6501200332006447 - }, - { - "x": 7.608681974415482, - "y": 0.9702682589092898, - "heading": 0.36638078190424284, - "angularVelocity": 1.190713930724979, - "velocityX": -1.681473120673997, - "velocityY": 1.171595804660104, - "timestamp": 2.712896683886722 - }, - { - "x": 7.4894658617031284, - "y": 1.0640549917537876, - "heading": 0.44559564372077526, - "angularVelocity": 1.2618523121384173, - "velocityX": -1.8990518195771442, - "velocityY": 1.4939747791498224, - "timestamp": 2.7756733345727995 - }, - { - "x": 7.3850011453729865, - "y": 1.1773175923573311, - "heading": 0.5224287487707303, - "angularVelocity": 1.2239121426558555, - "velocityX": -1.6640696053144117, - "velocityY": 1.8042154107572221, - "timestamp": 2.838449985258877 - }, - { - "x": 7.304887442001392, - "y": 1.2921451484809798, - "heading": 0.5937646097981798, - "angularVelocity": 1.1363438515408164, - "velocityX": -1.2761703992813151, - "velocityY": 1.8291443533338316, - "timestamp": 2.9012266359449543 - }, - { - "x": 7.248946273319072, - "y": 1.4036674724853684, - "heading": 0.6592587315660318, - "angularVelocity": 1.0432879271524667, - "velocityX": -0.89111426097038, - "velocityY": 1.7764936928870287, - "timestamp": 2.9640032866310317 - }, - { - "x": 7.216837756678371, - "y": 1.5099746657935773, - "heading": 0.7188062733566497, - "angularVelocity": 0.9485619436499262, - "velocityX": -0.511472279737646, - "velocityY": 1.6934193230507282, - "timestamp": 3.026779937317109 - }, - { - "x": 7.2083206421836685, - "y": 1.6100672540241319, - "heading": 0.7723537111783482, - "angularVelocity": 0.852983350282088, - "velocityX": -0.13567328619191607, - "velocityY": 1.5944238365165497, - "timestamp": 3.0895565880031866 - }, - { - "x": 7.223225116729736, - "y": 1.7033337354660034, - "heading": 0.8198674968406376, - "angularVelocity": 0.756870351365004, - "velocityX": 0.23742067127154262, - "velocityY": 1.4856874398773314, - "timestamp": 3.152333238689264 - }, - { - "x": 7.27271135474822, - "y": 1.8027189470978313, - "heading": 0.8672390842948998, - "angularVelocity": 0.6437256320959032, - "velocityX": 0.6724613119468245, - "velocityY": 1.3505312280373494, - "timestamp": 3.2259229562526697 - }, - { - "x": 7.35400506316251, - "y": 1.8915519590163101, - "heading": 0.9054727635913388, - "angularVelocity": 0.5195519233172289, - "velocityX": 1.1046884144411295, - "velocityY": 1.2071389164109743, - "timestamp": 3.2995126738160754 - }, - { - "x": 7.466685301502977, - "y": 1.9687099903311995, - "heading": 0.9330809947976589, - "angularVelocity": 0.3751642501213916, - "velocityX": 1.5311954179384002, - "velocityY": 1.0484892980926226, - "timestamp": 3.373102391379481 - }, - { - "x": 7.609496562805872, - "y": 2.0314329004014176, - "heading": 0.9463437924310599, - "angularVelocity": 0.18022623367148782, - "velocityX": 1.94064151937868, - "velocityY": 0.8523325288777645, - "timestamp": 3.446692108942887 - }, - { - "x": 7.769441496399576, - "y": 2.066360400529489, - "heading": 0.926435986763237, - "angularVelocity": -0.27052428419323904, - "velocityX": 2.1734685074160507, - "velocityY": 0.47462473405986094, - "timestamp": 3.5202818265062925 - }, - { - "x": 7.896070354750141, - "y": 2.0975447668572746, - "heading": 0.8984787949489146, - "angularVelocity": -0.3799062252173256, - "velocityX": 1.7207411924289624, - "velocityY": 0.42375983167644066, - "timestamp": 3.593871544069698 - }, - { - "x": 7.989237793438842, - "y": 2.1315842180129754, - "heading": 0.870112074863913, - "angularVelocity": -0.385471245497858, - "velocityX": 1.2660388132136353, - "velocityY": 0.462557165359026, - "timestamp": 3.667461261633104 - }, - { - "x": 8.0491571837208, - "y": 2.1703357076457843, - "heading": 0.8435612343509908, - "angularVelocity": -0.360795521331438, - "velocityX": 0.8142359050410887, - "velocityY": 0.5265883728853876, - "timestamp": 3.7410509791965096 - }, - { - "x": 8.075966835021973, - "y": 2.2146637439727783, - "heading": 0.8198674968406376, - "angularVelocity": -0.32197076296614946, - "velocityX": 0.3643124636002739, - "velocityY": 0.602367257202757, - "timestamp": 3.8146406967599154 - }, - { - "x": 8.065658316154911, - "y": 2.2705824615643997, - "heading": 0.798040914816282, - "angularVelocity": -0.27045894301415535, - "velocityX": -0.12773558011583175, - "velocityY": 0.6929035997326983, - "timestamp": 3.8953427130478855 - }, - { - "x": 8.015750610342254, - "y": 2.3343734551365007, - "heading": 0.7806541436934293, - "angularVelocity": -0.21544407342700392, - "velocityX": -0.6184195650647738, - "velocityY": 0.7904510507454373, - "timestamp": 3.9760447293358556 - }, - { - "x": 7.926453655040837, - "y": 2.4070123427009196, - "heading": 0.7682038158144716, - "angularVelocity": -0.15427530130760372, - "velocityX": -1.1065021595343643, - "velocityY": 0.9000876422370925, - "timestamp": 4.056746745623825 - }, - { - "x": 7.798300597392212, - "y": 2.4905748668995056, - "heading": 0.7617631797926459, - "angularVelocity": -0.07980762213974402, - "velocityX": -1.5879783869505226, - "velocityY": 1.0354453090788835, - "timestamp": 4.137448761911795 - }, - { - "x": 7.6341250792776, - "y": 2.5922508376962465, - "heading": 0.7651420089058008, - "angularVelocity": 0.041867964005981737, - "velocityX": -2.0343422093542554, - "velocityY": 1.259893810260321, - "timestamp": 4.218150778199765 - }, - { - "x": 7.503299903137412, - "y": 2.716557888863819, - "heading": 0.7789749381147177, - "angularVelocity": 0.17140747957965233, - "velocityX": -1.6210893129777915, - "velocityY": 1.540321504781316, - "timestamp": 4.298852794487734 - }, - { - "x": 7.412778623536083, - "y": 2.8434667937873646, - "heading": 0.7936597224297217, - "angularVelocity": 0.1819630412033834, - "velocityX": -1.121673085320711, - "velocityY": 1.572561761910569, - "timestamp": 4.379554810775704 - }, - { - "x": 7.362637719729284, - "y": 2.9695995939358717, - "heading": 0.8075159363518039, - "angularVelocity": 0.17169600661077414, - "velocityX": -0.6213091830057891, - "velocityY": 1.5629448426471295, - "timestamp": 4.460256827063674 - }, - { - "x": 7.352828025817871, - "y": 3.093616247177124, - "heading": 0.8198674968406376, - "angularVelocity": 0.15305144848871632, - "velocityX": -0.12155450833357581, - "velocityY": 1.5367231073722118, - "timestamp": 4.5409588433516435 - }, - { - "x": 7.376209766855443, - "y": 3.202133930016786, - "heading": 0.8294093077851656, - "angularVelocity": 0.13236517147010446, - "velocityX": 0.32435437881765383, - "velocityY": 1.5053706031398364, - "timestamp": 4.613045864722541 - }, - { - "x": 7.431715118407752, - "y": 3.3081199283035696, - "heading": 0.8373242445151483, - "angularVelocity": 0.10979697287337367, - "velocityX": 0.7699770429787373, - "velocityY": 1.470250764578984, - "timestamp": 4.685132886093439 - }, - { - "x": 7.519298702191713, - "y": 3.4110611826891666, - "heading": 0.843356829006912, - "angularVelocity": 0.08368475180469927, - "velocityX": 1.2149702140324468, - "velocityY": 1.4280137038254157, - "timestamp": 4.757219907464337 - }, - { - "x": 7.638803401309485, - "y": 3.5096258190021796, - "heading": 0.846842813737297, - "angularVelocity": 0.048358007642583994, - "velocityX": 1.6577838402131302, - "velocityY": 1.3673007212475086, - "timestamp": 4.829306928835234 - }, - { - "x": 7.7866293341563555, - "y": 3.592937298063221, - "heading": 0.8422109933086998, - "angularVelocity": -0.06425318095424966, - "velocityX": 2.0506594673441323, - "velocityY": 1.1557070534568574, - "timestamp": 4.901393950206132 - }, - { - "x": 7.902422158290993, - "y": 3.6727463242126577, - "heading": 0.836269970079196, - "angularVelocity": -0.08241460274709209, - "velocityX": 1.6062922552850192, - "velocityY": 1.1071205971850127, - "timestamp": 4.97348097157703 - }, - { - "x": 7.985997985487339, - "y": 3.751809828670273, - "heading": 0.8303494736313793, - "angularVelocity": -0.08212985271447092, - "velocityX": 1.159374123205014, - "velocityY": 1.0967786288577923, - "timestamp": 5.045567992947928 - }, - { - "x": 8.037348337530005, - "y": 3.8308962926568153, - "heading": 0.8248234470061144, - "angularVelocity": -0.07665771896487104, - "velocityX": 0.7123383802815468, - "velocityY": 1.0970971262584408, - "timestamp": 5.117655014318825 - }, - { - "x": 8.056475639343262, - "y": 3.91036605834961, - "heading": 0.8198674968406376, - "angularVelocity": -0.06874954841007745, - "velocityX": 0.26533627620487976, - "velocityY": 1.1024143345292632, - "timestamp": 5.189742035689723 - }, - { - "x": 8.038602621772776, - "y": 3.998385711044864, - "heading": 0.8152338670385548, - "angularVelocity": -0.05850975942244004, - "velocityX": -0.22568612575222455, - "velocityY": 1.111441553084628, - "timestamp": 5.2689361709557385 - }, - { - "x": 7.981845763142067, - "y": 4.087230799461618, - "heading": 0.8114606450928525, - "angularVelocity": -0.04764521934645741, - "velocityX": -0.7166800728369762, - "velocityY": 1.1218644931006536, - "timestamp": 5.348130306221754 - }, - { - "x": 7.8862096826404375, - "y": 4.177091396452943, - "heading": 0.8086332930137561, - "angularVelocity": -0.03570153357441573, - "velocityX": -1.2076156925053116, - "velocityY": 1.1346875206033977, - "timestamp": 5.4273244414877695 - }, - { - "x": 7.7517073125556175, - "y": 4.2683711663619475, - "heading": 0.8069339651264135, - "angularVelocity": -0.02145774913299528, - "velocityX": -1.698388013620231, - "velocityY": 1.1526076975573072, - "timestamp": 5.506518576753785 - }, - { - "x": 7.578419234770433, - "y": 4.362507297290165, - "heading": 0.8070145848526942, - "angularVelocity": 0.0010180012195335293, - "velocityX": -2.1881428113723835, - "velocityY": 1.1886755327526572, - "timestamp": 5.5857127120198005 - }, - { - "x": 7.443082908857005, - "y": 4.465110822204612, - "heading": 0.810340549913104, - "angularVelocity": 0.041997618248343985, - "velocityX": -1.7089185387128532, - "velocityY": 1.295594990333545, - "timestamp": 5.664906847285816 - }, - { - "x": 7.346616810702205, - "y": 4.569049242008833, - "heading": 0.8137765391642652, - "angularVelocity": 0.04338691545301451, - "velocityX": -1.2180964894782624, - "velocityY": 1.3124509719701911, - "timestamp": 5.744100982551831 - }, - { - "x": 7.289039194639553, - "y": 4.673588526541379, - "heading": 0.8169939108100028, - "angularVelocity": 0.040626387736041096, - "velocityX": -0.7270439391660353, - "velocityY": 1.3200382096653371, - "timestamp": 5.823295117817847 - }, - { - "x": 7.270353317260742, - "y": 4.778450012207031, - "heading": 0.8198674968406376, - "angularVelocity": 0.036285338819375686, - "velocityX": -0.23595026722679602, - "velocityY": 1.324106707061312, - "timestamp": 5.902489253083862 - }, - { - "x": 7.289014043717299, - "y": 4.88068568816019, - "heading": 0.8222762960338101, - "angularVelocity": 0.03124841992226066, - "velocityX": 0.2420783841267163, - "velocityY": 1.3262638671897284, - "timestamp": 5.979574724898599 - }, - { - "x": 7.344524131426211, - "y": 4.98285685804278, - "heading": 0.8242658459664968, - "angularVelocity": 0.025809661481585092, - "velocityX": 0.7201108899264711, - "velocityY": 1.3254270548948872, - "timestamp": 6.056660196713336 - }, - { - "x": 7.436880144401368, - "y": 5.084524008072969, - "heading": 0.8257771855643476, - "angularVelocity": 0.01960602383654279, - "velocityX": 1.1980988220078597, - "velocityY": 1.3188886003646867, - "timestamp": 6.133745668528073 - }, - { - "x": 7.566047618842119, - "y": 5.184523303532211, - "heading": 0.8266539297114365, - "angularVelocity": 0.0113736625909995, - "velocityX": 1.6756396685381336, - "velocityY": 1.2972521683408074, - "timestamp": 6.21083114034281 - }, - { - "x": 7.729695243719195, - "y": 5.271532958988885, - "heading": 0.8253528854696461, - "angularVelocity": -0.01687794354968993, - "velocityX": 2.1229373191147793, - "velocityY": 1.128742594529198, - "timestamp": 6.287916612157547 - }, - { - "x": 7.856810078203318, - "y": 5.353721770334639, - "heading": 0.8238224939840274, - "angularVelocity": -0.019853176605013328, - "velocityX": 1.6490115645867003, - "velocityY": 1.0662036491555977, - "timestamp": 6.365002083972284 - }, - { - "x": 7.947170405146476, - "y": 5.433265667965274, - "heading": 0.8223503538246106, - "angularVelocity": -0.019097504688754086, - "velocityX": 1.1722095592840742, - "velocityY": 1.0318922068973804, - "timestamp": 6.442087555787021 - }, - { - "x": 8.000736775791086, - "y": 5.510786321581349, - "heading": 0.8210189907962258, - "angularVelocity": -0.017271257437259078, - "velocityX": 0.6948958005128171, - "velocityY": 1.0056454451285384, - "timestamp": 6.519173027601758 - }, - { - "x": 8.017494201660156, - "y": 5.586577892303467, - "heading": 0.8198674968406376, - "angularVelocity": -0.014937885550672271, - "velocityX": 0.21738760202887633, - "velocityY": 0.9832147217606855, - "timestamp": 6.596258499416495 - }, - { - "x": 8.001058178964415, - "y": 5.655966769498319, - "heading": 0.8189692396431161, - "angularVelocity": -0.01248380955922443, - "velocityX": -0.22842475163111095, - "velocityY": 0.9643535624529807, - "timestamp": 6.668212272282072 - }, - { - "x": 7.952530398969952, - "y": 5.724380409150608, - "heading": 0.8182569283158968, - "angularVelocity": -0.009899568832200428, - "velocityX": -0.6744299577608278, - "velocityY": 0.9507998945392053, - "timestamp": 6.7401660451476495 - }, - { - "x": 7.87189772355959, - "y": 5.792466658632421, - "heading": 0.8177464489120707, - "angularVelocity": -0.007094546727657727, - "velocityX": -1.1206177549716323, - "velocityY": 0.9462498875355788, - "timestamp": 6.812119818013227 - }, - { - "x": 7.759174377472625, - "y": 5.861562497141862, - "heading": 0.8174705334046096, - "angularVelocity": -0.0038346218199920936, - "velocityX": -1.56660785943152, - "velocityY": 0.9602809659268983, - "timestamp": 6.884073590878804 - }, - { - "x": 7.614786537696026, - "y": 5.935967386280177, - "heading": 0.8175336610760453, - "angularVelocity": 0.000877336502612928, - "velocityX": -2.0066750362950487, - "velocityY": 1.0340651528769271, - "timestamp": 6.956027363744382 - }, - { - "x": 7.484818301160499, - "y": 6.039058243110454, - "heading": 0.8181586485127305, - "angularVelocity": 0.008685957828128987, - "velocityX": -1.8062741029345504, - "velocityY": 1.432737335717862, - "timestamp": 7.027981136609959 - }, - { - "x": 7.385682995229549, - "y": 6.1511025132387305, - "heading": 0.818795166961202, - "angularVelocity": 0.008846213660827327, - "velocityX": -1.3777638334011002, - "velocityY": 1.5571701894992422, - "timestamp": 7.099934909475537 - }, - { - "x": 7.318059950021479, - "y": 6.269295846242008, - "heading": 0.8193734302142015, - "angularVelocity": 0.008036593912591138, - "velocityX": -0.939812361672845, - "velocityY": 1.6426287086305138, - "timestamp": 7.171888682341114 - }, - { - "x": 7.282135486602783, - "y": 6.39259147644043, - "heading": 0.8198674968406376, - "angularVelocity": 0.006866445034913992, - "velocityX": -0.49927143481147734, - "velocityY": 1.7135394752511446, - "timestamp": 7.243842455206692 - }, - { - "x": 7.286904168920629, - "y": 6.553879554623115, - "heading": 0.8203325254948965, - "angularVelocity": 0.005168824637751526, - "velocityX": 0.053004223349143696, - "velocityY": 1.7927277913976019, - "timestamp": 7.3338104241067255 - }, - { - "x": 7.341636753267738, - "y": 6.719981696249637, - "heading": 0.8206365605797489, - "angularVelocity": 0.0033793703311251993, - "velocityX": 0.6083563407763986, - "velocityY": 1.8462364290015696, - "timestamp": 7.423778393006759 - }, - { - "x": 7.446563747944571, - "y": 6.886379142294885, - "heading": 0.820764329190319, - "angularVelocity": 0.001420156663891545, - "velocityX": 1.1662705734017564, - "velocityY": 1.849518757393953, - "timestamp": 7.513746361906793 - }, - { - "x": 7.600302411388221, - "y": 7.041072515762031, - "heading": 0.8206814844261792, - "angularVelocity": -0.0009208251020092812, - "velocityX": 1.7088155409451857, - "velocityY": 1.7194272067987995, - "timestamp": 7.6037143308068265 - }, - { - "x": 7.76802308843853, - "y": 7.147557323311432, - "heading": 0.8204072045485765, - "angularVelocity": -0.003048639209665928, - "velocityX": 1.8642265586396518, - "velocityY": 1.1835857678160966, - "timestamp": 7.69368229970686 - }, - { - "x": 7.900882335524022, - "y": 7.21792776288154, - "heading": 0.820151434889582, - "angularVelocity": -0.0028428968900996348, - "velocityX": 1.476739429708772, - "velocityY": 0.7821721489377994, - "timestamp": 7.783650268606894 - }, - { - "x": 7.9912812220923835, - "y": 7.261527222664065, - "heading": 0.8199653016614122, - "angularVelocity": -0.002068883297527331, - "velocityX": 1.0047896787445156, - "velocityY": 0.4846109155911976, - "timestamp": 7.8736182375069275 - }, - { - "x": 8.036985397338867, - "y": 7.282280445098877, - "heading": 0.8198674968406376, - "angularVelocity": -0.0010871071334649601, - "velocityX": 0.508004968938088, - "velocityY": 0.23067345732648378, - "timestamp": 7.963586206406961 - }, - { - "x": 8.036985397338867, - "y": 7.282280445098877, - "heading": 0.8198674968406376, - "angularVelocity": 7.161218867731583e-30, - "velocityX": 3.413616499289714e-27, - "velocityY": -1.3859610434341907e-27, - "timestamp": 8.053554175306994 - } - ], - "eventMarkers": [] -} \ No newline at end of file diff --git a/src/main/deploy/choreo/SourceLanehgfedChaos.traj b/src/main/deploy/choreo/SourceLanehgfedChaos.traj deleted file mode 100644 index ad6a507..0000000 --- a/src/main/deploy/choreo/SourceLanehgfedChaos.traj +++ /dev/null @@ -1,914 +0,0 @@ -{ - "samples": [ - { - "x": 1.351629376411438, - "y": 1.5909570455551147, - "heading": 1.6862047834588912e-26, - "angularVelocity": 6.3647901274820834e-27, - "velocityX": 4.986194855238315e-27, - "velocityY": -6.2765729904834755e-28, - "timestamp": 0 - }, - { - "x": 1.4098407784450662, - "y": 1.5833792294289561, - "heading": -0.010593951823815846, - "angularVelocity": -0.10883093955766905, - "velocityX": 0.5980017354852467, - "velocityY": -0.07784638466555155, - "timestamp": 0.09734319915709407 - }, - { - "x": 1.5262696008571386, - "y": 1.5682228137234184, - "heading": -0.03122579099456415, - "angularVelocity": -0.21194946693145247, - "velocityX": 1.196065297013483, - "velocityY": -0.1557008176922354, - "timestamp": 0.19468639831418813 - }, - { - "x": 1.7009243165309464, - "y": 1.5454866954595423, - "heading": -0.06105764336616573, - "angularVelocity": -0.30646057074268174, - "velocityX": 1.794215899889905, - "velocityY": -0.23356658154602322, - "timestamp": 0.2920295974712822 - }, - { - "x": 1.9338175006021991, - "y": 1.5151692376373096, - "heading": -0.09868568267417419, - "angularVelocity": -0.386550263745531, - "velocityX": 2.392495686271887, - "velocityY": -0.3114491621885752, - "timestamp": 0.38937279662837626 - }, - { - "x": 2.2249683008322316, - "y": 1.4772679476485795, - "heading": -0.1412661608706324, - "angularVelocity": -0.43742632834309375, - "velocityX": 2.990972176291112, - "velocityY": -0.38935734922338544, - "timestamp": 0.4867159957854703 - }, - { - "x": 2.5743813690719564, - "y": 1.4317822199269228, - "heading": -0.17988502274771773, - "angularVelocity": -0.39672891595397014, - "velocityX": 3.589496454455294, - "velocityY": -0.46727175720053415, - "timestamp": 0.5840591949425644 - }, - { - "x": 2.9339510004802603, - "y": 1.3849743359699507, - "heading": -0.17988503154826246, - "angularVelocity": -9.040739168662314e-8, - "velocityX": 3.6938341303949174, - "velocityY": -0.48085417740825276, - "timestamp": 0.6814023940996585 - }, - { - "x": 3.293520631888573, - "y": 1.338166452012977, - "heading": -0.1798850403487868, - "angularVelocity": -9.04071820339056e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 0.7787455932567526 - }, - { - "x": 3.6530902632968862, - "y": 1.2913585680560036, - "heading": -0.17988504914931117, - "angularVelocity": -9.040718252069144e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 0.8760887924138467 - }, - { - "x": 4.0126598947052, - "y": 1.2445506840990304, - "heading": -0.17988505794983556, - "angularVelocity": -9.040718271704664e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 0.9734319915709408 - }, - { - "x": 4.372229526113513, - "y": 1.197742800142057, - "heading": -0.1798850667503599, - "angularVelocity": -9.040718230350781e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.070775190728035 - }, - { - "x": 4.7317991575218254, - "y": 1.1509349161850833, - "heading": -0.17988507555088423, - "angularVelocity": -9.040718209591692e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.168118389885129 - }, - { - "x": 5.091368788930138, - "y": 1.1041270322281096, - "heading": -0.1798850843514086, - "angularVelocity": -9.040718222578003e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.2654615890422232 - }, - { - "x": 5.450938420338452, - "y": 1.0573191482711366, - "heading": -0.179885093151933, - "angularVelocity": -9.040718271874344e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.3628047881993173 - }, - { - "x": 5.810508051746765, - "y": 1.0105112643141632, - "heading": -0.17988510195245733, - "angularVelocity": -9.040718207825685e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.4601479873564114 - }, - { - "x": 6.170077683155077, - "y": 0.9637033803571897, - "heading": -0.17988511075298164, - "angularVelocity": -9.04071820559312e-8, - "velocityX": 3.693834130395013, - "velocityY": -0.4808541774082652, - "timestamp": 1.5574911865135055 - }, - { - "x": 6.529647314563391, - "y": 0.9168954964002163, - "heading": -0.17988511955350583, - "angularVelocity": -9.040718096164527e-8, - "velocityX": 3.6938341303950133, - "velocityY": -0.48085417740826525, - "timestamp": 1.6548343856705996 - }, - { - "x": 6.889216945971645, - "y": 0.8700876124432507, - "heading": -0.1798851283540626, - "angularVelocity": -9.04075151499357e-8, - "velocityX": 3.69383413039441, - "velocityY": -0.48085417740818676, - "timestamp": 1.7521775848276937 - }, - { - "x": 7.209691958187603, - "y": 0.8283689691747375, - "heading": -0.18458655717583616, - "angularVelocity": -0.04829745542044847, - "velocityX": 3.2922177922134055, - "velocityY": -0.42857275731391337, - "timestamp": 1.8495207839847878 - }, - { - "x": 7.471997908032522, - "y": 0.7942226303599829, - "heading": -0.17541534915765347, - "angularVelocity": 0.0942151901478197, - "velocityX": 2.6946510091743066, - "velocityY": -0.3507829936804171, - "timestamp": 1.946863983141882 - }, - { - "x": 7.676134768878821, - "y": 0.7676485994652997, - "heading": -0.15237304219148237, - "angularVelocity": 0.23671203705751462, - "velocityX": 2.097083952591902, - "velocityY": -0.2729931944377309, - "timestamp": 2.044207182298976 - }, - { - "x": 7.822102528983219, - "y": 0.7486468780193989, - "heading": -0.11546022153411278, - "angularVelocity": 0.37920287166439925, - "velocityX": 1.499516775371568, - "velocityY": -0.19520337949069788, - "timestamp": 2.14155038145607 - }, - { - "x": 7.909901201272586, - "y": 0.7372174643394926, - "heading": -0.0646733025478063, - "angularVelocity": 0.5217305310085989, - "velocityX": 0.9019497309480833, - "velocityY": -0.11741358183082976, - "timestamp": 2.238893580613164 - }, - { - "x": 7.939530849456787, - "y": 0.7333603501319885, - "heading": -2.1258841512221986e-26, - "angularVelocity": 0.6643843957032423, - "velocityX": 0.3043833410116731, - "velocityY": -0.03962386937046781, - "timestamp": 2.3362367797702577 - }, - { - "x": 7.936937891558933, - "y": 0.7420288327845614, - "heading": 0.047244903822912916, - "angularVelocity": 0.7525872009191306, - "velocityX": -0.04130449569252893, - "velocityY": 0.13808450367829891, - "timestamp": 2.399013430456335 - }, - { - "x": 7.912801567759522, - "y": 0.7621552551197827, - "heading": 0.10003244844139744, - "angularVelocity": 0.8408786394555429, - "velocityX": -0.3844793173198744, - "velocityY": 0.3206036339190191, - "timestamp": 2.4617900811424125 - }, - { - "x": 7.8673509529868335, - "y": 0.7941607762713011, - "heading": 0.15836683953243252, - "angularVelocity": 0.9292370722793692, - "velocityX": -0.7240050922750012, - "velocityY": 0.5098316141707855, - "timestamp": 2.52456673182849 - }, - { - "x": 7.800947406113619, - "y": 0.8386725592749237, - "heading": 0.22224423895016934, - "angularVelocity": 1.0175343653990714, - "velocityX": -1.057774604849075, - "velocityY": 0.7090499814367216, - "timestamp": 2.5873433825145673 - }, - { - "x": 7.714239225150062, - "y": 0.8967193983348688, - "heading": 0.2916317494080749, - "angularVelocity": 1.1053076215372926, - "velocityX": -1.3812170610559127, - "velocityY": 0.9246565152100241, - "timestamp": 2.6501200332006447 - }, - { - "x": 7.608681974415482, - "y": 0.9702682589092898, - "heading": 0.36638078190424284, - "angularVelocity": 1.190713930724979, - "velocityX": -1.681473120673997, - "velocityY": 1.171595804660104, - "timestamp": 2.712896683886722 - }, - { - "x": 7.4894658617031284, - "y": 1.0640549917537876, - "heading": 0.44559564372077526, - "angularVelocity": 1.2618523121384173, - "velocityX": -1.8990518195771442, - "velocityY": 1.4939747791498224, - "timestamp": 2.7756733345727995 - }, - { - "x": 7.3850011453729865, - "y": 1.1773175923573311, - "heading": 0.5224287487707303, - "angularVelocity": 1.2239121426558555, - "velocityX": -1.6640696053144117, - "velocityY": 1.8042154107572221, - "timestamp": 2.838449985258877 - }, - { - "x": 7.304887442001392, - "y": 1.2921451484809798, - "heading": 0.5937646097981798, - "angularVelocity": 1.1363438515408164, - "velocityX": -1.2761703992813151, - "velocityY": 1.8291443533338316, - "timestamp": 2.9012266359449543 - }, - { - "x": 7.248946273319072, - "y": 1.4036674724853684, - "heading": 0.6592587315660318, - "angularVelocity": 1.0432879271524667, - "velocityX": -0.89111426097038, - "velocityY": 1.7764936928870287, - "timestamp": 2.9640032866310317 - }, - { - "x": 7.216837756678371, - "y": 1.5099746657935773, - "heading": 0.7188062733566497, - "angularVelocity": 0.9485619436499262, - "velocityX": -0.511472279737646, - "velocityY": 1.6934193230507282, - "timestamp": 3.026779937317109 - }, - { - "x": 7.2083206421836685, - "y": 1.6100672540241319, - "heading": 0.7723537111783482, - "angularVelocity": 0.852983350282088, - "velocityX": -0.13567328619191607, - "velocityY": 1.5944238365165497, - "timestamp": 3.0895565880031866 - }, - { - "x": 7.223225116729736, - "y": 1.7033337354660034, - "heading": 0.8198674968406376, - "angularVelocity": 0.756870351365004, - "velocityX": 0.23742067127154262, - "velocityY": 1.4856874398773314, - "timestamp": 3.152333238689264 - }, - { - "x": 7.27271135474822, - "y": 1.8027189470978313, - "heading": 0.8672390842948998, - "angularVelocity": 0.6437256320959032, - "velocityX": 0.6724613119468245, - "velocityY": 1.3505312280373494, - "timestamp": 3.2259229562526697 - }, - { - "x": 7.35400506316251, - "y": 1.8915519590163101, - "heading": 0.9054727635913388, - "angularVelocity": 0.5195519233172289, - "velocityX": 1.1046884144411295, - "velocityY": 1.2071389164109743, - "timestamp": 3.2995126738160754 - }, - { - "x": 7.466685301502977, - "y": 1.9687099903311995, - "heading": 0.9330809947976589, - "angularVelocity": 0.3751642501213916, - "velocityX": 1.5311954179384002, - "velocityY": 1.0484892980926226, - "timestamp": 3.373102391379481 - }, - { - "x": 7.609496562805872, - "y": 2.0314329004014176, - "heading": 0.9463437924310599, - "angularVelocity": 0.18022623367148782, - "velocityX": 1.94064151937868, - "velocityY": 0.8523325288777645, - "timestamp": 3.446692108942887 - }, - { - "x": 7.769441496399576, - "y": 2.066360400529489, - "heading": 0.926435986763237, - "angularVelocity": -0.27052428419323904, - "velocityX": 2.1734685074160507, - "velocityY": 0.47462473405986094, - "timestamp": 3.5202818265062925 - }, - { - "x": 7.896070354750141, - "y": 2.0975447668572746, - "heading": 0.8984787949489146, - "angularVelocity": -0.3799062252173256, - "velocityX": 1.7207411924289624, - "velocityY": 0.42375983167644066, - "timestamp": 3.593871544069698 - }, - { - "x": 7.989237793438842, - "y": 2.1315842180129754, - "heading": 0.870112074863913, - "angularVelocity": -0.385471245497858, - "velocityX": 1.2660388132136353, - "velocityY": 0.462557165359026, - "timestamp": 3.667461261633104 - }, - { - "x": 8.0491571837208, - "y": 2.1703357076457843, - "heading": 0.8435612343509908, - "angularVelocity": -0.360795521331438, - "velocityX": 0.8142359050410887, - "velocityY": 0.5265883728853876, - "timestamp": 3.7410509791965096 - }, - { - "x": 8.075966835021973, - "y": 2.2146637439727783, - "heading": 0.8198674968406376, - "angularVelocity": -0.32197076296614946, - "velocityX": 0.3643124636002739, - "velocityY": 0.602367257202757, - "timestamp": 3.8146406967599154 - }, - { - "x": 8.065658316154911, - "y": 2.2705824615643997, - "heading": 0.798040914816282, - "angularVelocity": -0.27045894301415535, - "velocityX": -0.12773558011583175, - "velocityY": 0.6929035997326983, - "timestamp": 3.8953427130478855 - }, - { - "x": 8.015750610342254, - "y": 2.3343734551365007, - "heading": 0.7806541436934293, - "angularVelocity": -0.21544407342700392, - "velocityX": -0.6184195650647738, - "velocityY": 0.7904510507454373, - "timestamp": 3.9760447293358556 - }, - { - "x": 7.926453655040837, - "y": 2.4070123427009196, - "heading": 0.7682038158144716, - "angularVelocity": -0.15427530130760372, - "velocityX": -1.1065021595343643, - "velocityY": 0.9000876422370925, - "timestamp": 4.056746745623825 - }, - { - "x": 7.798300597392212, - "y": 2.4905748668995056, - "heading": 0.7617631797926459, - "angularVelocity": -0.07980762213974402, - "velocityX": -1.5879783869505226, - "velocityY": 1.0354453090788835, - "timestamp": 4.137448761911795 - }, - { - "x": 7.6341250792776, - "y": 2.5922508376962465, - "heading": 0.7651420089058008, - "angularVelocity": 0.041867964005981737, - "velocityX": -2.0343422093542554, - "velocityY": 1.259893810260321, - "timestamp": 4.218150778199765 - }, - { - "x": 7.503299903137412, - "y": 2.716557888863819, - "heading": 0.7789749381147177, - "angularVelocity": 0.17140747957965233, - "velocityX": -1.6210893129777915, - "velocityY": 1.540321504781316, - "timestamp": 4.298852794487734 - }, - { - "x": 7.412778623536083, - "y": 2.8434667937873646, - "heading": 0.7936597224297217, - "angularVelocity": 0.1819630412033834, - "velocityX": -1.121673085320711, - "velocityY": 1.572561761910569, - "timestamp": 4.379554810775704 - }, - { - "x": 7.362637719729284, - "y": 2.9695995939358717, - "heading": 0.8075159363518039, - "angularVelocity": 0.17169600661077414, - "velocityX": -0.6213091830057891, - "velocityY": 1.5629448426471295, - "timestamp": 4.460256827063674 - }, - { - "x": 7.352828025817871, - "y": 3.093616247177124, - "heading": 0.8198674968406376, - "angularVelocity": 0.15305144848871632, - "velocityX": -0.12155450833357581, - "velocityY": 1.5367231073722118, - "timestamp": 4.5409588433516435 - }, - { - "x": 7.376209766855443, - "y": 3.202133930016786, - "heading": 0.8294093077851656, - "angularVelocity": 0.13236517147010446, - "velocityX": 0.32435437881765383, - "velocityY": 1.5053706031398364, - "timestamp": 4.613045864722541 - }, - { - "x": 7.431715118407752, - "y": 3.3081199283035696, - "heading": 0.8373242445151483, - "angularVelocity": 0.10979697287337367, - "velocityX": 0.7699770429787373, - "velocityY": 1.470250764578984, - "timestamp": 4.685132886093439 - }, - { - "x": 7.519298702191713, - "y": 3.4110611826891666, - "heading": 0.843356829006912, - "angularVelocity": 0.08368475180469927, - "velocityX": 1.2149702140324468, - "velocityY": 1.4280137038254157, - "timestamp": 4.757219907464337 - }, - { - "x": 7.638803401309485, - "y": 3.5096258190021796, - "heading": 0.846842813737297, - "angularVelocity": 0.048358007642583994, - "velocityX": 1.6577838402131302, - "velocityY": 1.3673007212475086, - "timestamp": 4.829306928835234 - }, - { - "x": 7.7866293341563555, - "y": 3.592937298063221, - "heading": 0.8422109933086998, - "angularVelocity": -0.06425318095424966, - "velocityX": 2.0506594673441323, - "velocityY": 1.1557070534568574, - "timestamp": 4.901393950206132 - }, - { - "x": 7.902422158290993, - "y": 3.6727463242126577, - "heading": 0.836269970079196, - "angularVelocity": -0.08241460274709209, - "velocityX": 1.6062922552850192, - "velocityY": 1.1071205971850127, - "timestamp": 4.97348097157703 - }, - { - "x": 7.985997985487339, - "y": 3.751809828670273, - "heading": 0.8303494736313793, - "angularVelocity": -0.08212985271447092, - "velocityX": 1.159374123205014, - "velocityY": 1.0967786288577923, - "timestamp": 5.045567992947928 - }, - { - "x": 8.037348337530005, - "y": 3.8308962926568153, - "heading": 0.8248234470061144, - "angularVelocity": -0.07665771896487104, - "velocityX": 0.7123383802815468, - "velocityY": 1.0970971262584408, - "timestamp": 5.117655014318825 - }, - { - "x": 8.056475639343262, - "y": 3.91036605834961, - "heading": 0.8198674968406376, - "angularVelocity": -0.06874954841007745, - "velocityX": 0.26533627620487976, - "velocityY": 1.1024143345292632, - "timestamp": 5.189742035689723 - }, - { - "x": 8.038602621772776, - "y": 3.998385711044864, - "heading": 0.8152338670385548, - "angularVelocity": -0.05850975942244004, - "velocityX": -0.22568612575222455, - "velocityY": 1.111441553084628, - "timestamp": 5.2689361709557385 - }, - { - "x": 7.981845763142067, - "y": 4.087230799461618, - "heading": 0.8114606450928525, - "angularVelocity": -0.04764521934645741, - "velocityX": -0.7166800728369762, - "velocityY": 1.1218644931006536, - "timestamp": 5.348130306221754 - }, - { - "x": 7.8862096826404375, - "y": 4.177091396452943, - "heading": 0.8086332930137561, - "angularVelocity": -0.03570153357441573, - "velocityX": -1.2076156925053116, - "velocityY": 1.1346875206033977, - "timestamp": 5.4273244414877695 - }, - { - "x": 7.7517073125556175, - "y": 4.2683711663619475, - "heading": 0.8069339651264135, - "angularVelocity": -0.02145774913299528, - "velocityX": -1.698388013620231, - "velocityY": 1.1526076975573072, - "timestamp": 5.506518576753785 - }, - { - "x": 7.578419234770433, - "y": 4.362507297290165, - "heading": 0.8070145848526942, - "angularVelocity": 0.0010180012195335293, - "velocityX": -2.1881428113723835, - "velocityY": 1.1886755327526572, - "timestamp": 5.5857127120198005 - }, - { - "x": 7.443082908857005, - "y": 4.465110822204612, - "heading": 0.810340549913104, - "angularVelocity": 0.041997618248343985, - "velocityX": -1.7089185387128532, - "velocityY": 1.295594990333545, - "timestamp": 5.664906847285816 - }, - { - "x": 7.346616810702205, - "y": 4.569049242008833, - "heading": 0.8137765391642652, - "angularVelocity": 0.04338691545301451, - "velocityX": -1.2180964894782624, - "velocityY": 1.3124509719701911, - "timestamp": 5.744100982551831 - }, - { - "x": 7.289039194639553, - "y": 4.673588526541379, - "heading": 0.8169939108100028, - "angularVelocity": 0.040626387736041096, - "velocityX": -0.7270439391660353, - "velocityY": 1.3200382096653371, - "timestamp": 5.823295117817847 - }, - { - "x": 7.270353317260742, - "y": 4.778450012207031, - "heading": 0.8198674968406376, - "angularVelocity": 0.036285338819375686, - "velocityX": -0.23595026722679602, - "velocityY": 1.324106707061312, - "timestamp": 5.902489253083862 - }, - { - "x": 7.289014043717299, - "y": 4.88068568816019, - "heading": 0.8222762960338101, - "angularVelocity": 0.03124841992226066, - "velocityX": 0.2420783841267163, - "velocityY": 1.3262638671897284, - "timestamp": 5.979574724898599 - }, - { - "x": 7.344524131426211, - "y": 4.98285685804278, - "heading": 0.8242658459664968, - "angularVelocity": 0.025809661481585092, - "velocityX": 0.7201108899264711, - "velocityY": 1.3254270548948872, - "timestamp": 6.056660196713336 - }, - { - "x": 7.436880144401368, - "y": 5.084524008072969, - "heading": 0.8257771855643476, - "angularVelocity": 0.01960602383654279, - "velocityX": 1.1980988220078597, - "velocityY": 1.3188886003646867, - "timestamp": 6.133745668528073 - }, - { - "x": 7.566047618842119, - "y": 5.184523303532211, - "heading": 0.8266539297114365, - "angularVelocity": 0.0113736625909995, - "velocityX": 1.6756396685381336, - "velocityY": 1.2972521683408074, - "timestamp": 6.21083114034281 - }, - { - "x": 7.729695243719195, - "y": 5.271532958988885, - "heading": 0.8253528854696461, - "angularVelocity": -0.01687794354968993, - "velocityX": 2.1229373191147793, - "velocityY": 1.128742594529198, - "timestamp": 6.287916612157547 - }, - { - "x": 7.856810078203318, - "y": 5.353721770334639, - "heading": 0.8238224939840274, - "angularVelocity": -0.019853176605013328, - "velocityX": 1.6490115645867003, - "velocityY": 1.0662036491555977, - "timestamp": 6.365002083972284 - }, - { - "x": 7.947170405146476, - "y": 5.433265667965274, - "heading": 0.8223503538246106, - "angularVelocity": -0.019097504688754086, - "velocityX": 1.1722095592840742, - "velocityY": 1.0318922068973804, - "timestamp": 6.442087555787021 - }, - { - "x": 8.000736775791086, - "y": 5.510786321581349, - "heading": 0.8210189907962258, - "angularVelocity": -0.017271257437259078, - "velocityX": 0.6948958005128171, - "velocityY": 1.0056454451285384, - "timestamp": 6.519173027601758 - }, - { - "x": 8.017494201660156, - "y": 5.586577892303467, - "heading": 0.8198674968406376, - "angularVelocity": -0.014937885550672271, - "velocityX": 0.21738760202887633, - "velocityY": 0.9832147217606855, - "timestamp": 6.596258499416495 - }, - { - "x": 8.001058178964415, - "y": 5.655966769498319, - "heading": 0.8189692396431161, - "angularVelocity": -0.01248380955922443, - "velocityX": -0.22842475163111095, - "velocityY": 0.9643535624529807, - "timestamp": 6.668212272282072 - }, - { - "x": 7.952530398969952, - "y": 5.724380409150608, - "heading": 0.8182569283158968, - "angularVelocity": -0.009899568832200428, - "velocityX": -0.6744299577608278, - "velocityY": 0.9507998945392053, - "timestamp": 6.7401660451476495 - }, - { - "x": 7.87189772355959, - "y": 5.792466658632421, - "heading": 0.8177464489120707, - "angularVelocity": -0.007094546727657727, - "velocityX": -1.1206177549716323, - "velocityY": 0.9462498875355788, - "timestamp": 6.812119818013227 - }, - { - "x": 7.759174377472625, - "y": 5.861562497141862, - "heading": 0.8174705334046096, - "angularVelocity": -0.0038346218199920936, - "velocityX": -1.56660785943152, - "velocityY": 0.9602809659268983, - "timestamp": 6.884073590878804 - }, - { - "x": 7.614786537696026, - "y": 5.935967386280177, - "heading": 0.8175336610760453, - "angularVelocity": 0.000877336502612928, - "velocityX": -2.0066750362950487, - "velocityY": 1.0340651528769271, - "timestamp": 6.956027363744382 - }, - { - "x": 7.484818301160499, - "y": 6.039058243110454, - "heading": 0.8181586485127305, - "angularVelocity": 0.008685957828128987, - "velocityX": -1.8062741029345504, - "velocityY": 1.432737335717862, - "timestamp": 7.027981136609959 - }, - { - "x": 7.385682995229549, - "y": 6.1511025132387305, - "heading": 0.818795166961202, - "angularVelocity": 0.008846213660827327, - "velocityX": -1.3777638334011002, - "velocityY": 1.5571701894992422, - "timestamp": 7.099934909475537 - }, - { - "x": 7.318059950021479, - "y": 6.269295846242008, - "heading": 0.8193734302142015, - "angularVelocity": 0.008036593912591138, - "velocityX": -0.939812361672845, - "velocityY": 1.6426287086305138, - "timestamp": 7.171888682341114 - }, - { - "x": 7.282135486602783, - "y": 6.39259147644043, - "heading": 0.8198674968406376, - "angularVelocity": 0.006866445034913992, - "velocityX": -0.49927143481147734, - "velocityY": 1.7135394752511446, - "timestamp": 7.243842455206692 - }, - { - "x": 7.286904168920629, - "y": 6.553879554623115, - "heading": 0.8203325254948965, - "angularVelocity": 0.005168824637751526, - "velocityX": 0.053004223349143696, - "velocityY": 1.7927277913976019, - "timestamp": 7.3338104241067255 - }, - { - "x": 7.341636753267738, - "y": 6.719981696249637, - "heading": 0.8206365605797489, - "angularVelocity": 0.0033793703311251993, - "velocityX": 0.6083563407763986, - "velocityY": 1.8462364290015696, - "timestamp": 7.423778393006759 - }, - { - "x": 7.446563747944571, - "y": 6.886379142294885, - "heading": 0.820764329190319, - "angularVelocity": 0.001420156663891545, - "velocityX": 1.1662705734017564, - "velocityY": 1.849518757393953, - "timestamp": 7.513746361906793 - }, - { - "x": 7.600302411388221, - "y": 7.041072515762031, - "heading": 0.8206814844261792, - "angularVelocity": -0.0009208251020092812, - "velocityX": 1.7088155409451857, - "velocityY": 1.7194272067987995, - "timestamp": 7.6037143308068265 - }, - { - "x": 7.76802308843853, - "y": 7.147557323311432, - "heading": 0.8204072045485765, - "angularVelocity": -0.003048639209665928, - "velocityX": 1.8642265586396518, - "velocityY": 1.1835857678160966, - "timestamp": 7.69368229970686 - }, - { - "x": 7.900882335524022, - "y": 7.21792776288154, - "heading": 0.820151434889582, - "angularVelocity": -0.0028428968900996348, - "velocityX": 1.476739429708772, - "velocityY": 0.7821721489377994, - "timestamp": 7.783650268606894 - }, - { - "x": 7.9912812220923835, - "y": 7.261527222664065, - "heading": 0.8199653016614122, - "angularVelocity": -0.002068883297527331, - "velocityX": 1.0047896787445156, - "velocityY": 0.4846109155911976, - "timestamp": 7.8736182375069275 - }, - { - "x": 8.036985397338867, - "y": 7.282280445098877, - "heading": 0.8198674968406376, - "angularVelocity": -0.0010871071334649601, - "velocityX": 0.508004968938088, - "velocityY": 0.23067345732648378, - "timestamp": 7.963586206406961 - }, - { - "x": 8.036985397338867, - "y": 7.282280445098877, - "heading": 0.8198674968406376, - "angularVelocity": 7.161218867731583e-30, - "velocityX": 3.413616499289714e-27, - "velocityY": -1.3859610434341907e-27, - "timestamp": 8.053554175306994 - } - ], - "eventMarkers": [] -} \ No newline at end of file diff --git a/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos.java b/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos.java index 276cbcc..c229d4a 100644 --- a/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos.java +++ b/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos.java @@ -1,18 +1,18 @@ package org.team1540.robot2024.commands.autos; +import org.team1540.robot2024.util.auto.AutoCommand; import org.team1540.robot2024.commands.indexer.IntakeAndFeed; import org.team1540.robot2024.subsystems.indexer.Indexer; -import org.team1540.robot2024.util.auto.AutoCommand; import org.team1540.robot2024.util.auto.PathHelper; public class SourceLanehgfedChaos extends AutoCommand { - public SourceLanehgfedChaos (Indexer indexer) { - super("SourceLanephgfedChaos"); + public SourceLanehgfedChaos(Indexer indexer) { + super("SourceLanephgfedChaos2"); addPath( PathHelper.fromChoreoPath("SourceLanehgfedChaos.1", true, true) ); - addCommands( - new IntakeAndFeed(indexer, () -> 1, () -> 0.05)//TODO: tune shoot speed to not eject note out of field - ); + addCommands( + new IntakeAndFeed(indexer, () -> 1, () -> 0.05)//TODO: tune shoot speed to not eject note out of field + ); } } diff --git a/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos2.java b/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos2.java deleted file mode 100644 index af29d86..0000000 --- a/src/main/java/org/team1540/robot2024/commands/autos/SourceLanehgfedChaos2.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.team1540.robot2024.commands.autos; - -import org.team1540.robot2024.util.auto.AutoCommand; -import org.team1540.robot2024.commands.indexer.IntakeAndFeed; -import org.team1540.robot2024.subsystems.indexer.Indexer; -import org.team1540.robot2024.util.auto.PathHelper; - -public class SourceLanehgfedChaos2 extends AutoCommand { - public SourceLanehgfedChaos2 (Indexer indexer) { - super("SourceLanephgfedChaos2"); - addPath( - PathHelper.fromChoreoPath("SourceLanehgfedChaos2.1", true, true) - ); - addCommands( - new IntakeAndFeed(indexer, () -> 1, () -> 0.05)//TODO: tune shoot speed to not eject note out of field - ); - } -}