diff --git a/choreo.chor b/choreo.chor index 9fb4498..0ebd01d 100644 --- a/choreo.chor +++ b/choreo.chor @@ -16815,7 +16815,7 @@ "usesDefaultFieldObstacles": true, "circleObstacles": [], "eventMarkers": [], - "isTrajectoryStale": false + "isTrajectoryStale": true }, "amp to f2": { "waypoints": [ @@ -17131,13 +17131,13 @@ "f2 to amp": { "waypoints": [ { - "x": 7.831524848937988, - "y": 5.777753829956055, - "heading": 0, + "x": 6.13504695892334, + "y": 6.022806644439697, + "heading": -0.4868991120519326, "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 26 + "controlIntervalCount": 22 }, { "x": 1.9026927947998047, @@ -17151,263 +17151,227 @@ ], "trajectory": [ { - "x": 7.831524848937988, + "x": 6.0027, "y": 5.777753829956055, - "heading": 7.029948882834116e-26, - "angularVelocity": 2.849398599973591e-26, - "velocityX": -5.696194540957051e-26, - "velocityY": -3.034591620800879e-25, + "heading": -3.110893343443771e-23, + "angularVelocity": -4.9155948824066646e-24, + "velocityX": 2.1897737903021007e-23, + "velocityY": -9.118614041203597e-24, "timestamp": 0 }, { - "x": 7.779954908494634, - "y": 5.794474396396209, - "heading": -0.07319301310420766, - "angularVelocity": -1.0590921205646053, - "velocityX": -0.7462094435678169, - "velocityY": 0.2419441339698886, - "timestamp": 0.06910920370665039 - }, - { - "x": 7.676470234042897, - "y": 5.828632018152386, - "heading": -0.21492189956774962, - "angularVelocity": -2.0507961148726617, - "velocityX": -1.4974079992442166, - "velocityY": 0.49425575645708864, - "timestamp": 0.13821840741330077 - }, - { - "x": 7.5202094983036165, - "y": 5.881072211168531, - "heading": -0.41336794916178154, - "angularVelocity": -2.871485112697593, - "velocityX": -2.261069833803386, - "velocityY": 0.758801870134973, - "timestamp": 0.20732761111995116 - }, - { - "x": 7.30957736611775, - "y": 5.952525731358735, - "heading": -0.6421200430409219, - "angularVelocity": -3.3100091103658236, - "velocityX": -3.0478159331706767, - "velocityY": 1.0339219142721563, - "timestamp": 0.27643681482660154 - }, - { - "x": 7.055328146082673, - "y": 6.045103060191937, - "heading": -0.7564162169705557, - "angularVelocity": -1.6538488044919417, - "velocityX": -3.6789487709089363, - "velocityY": 1.3395803144566223, - "timestamp": 0.34554601853325195 - }, - { - "x": 6.7630078551020265, - "y": 6.143682353526842, - "heading": -0.7564163372202867, - "angularVelocity": -0.0000017399958979532222, - "velocityX": -4.229831560807253, - "velocityY": 1.4264278568936668, - "timestamp": 0.41465522223990237 - }, - { - "x": 6.470687462340844, - "y": 6.242261345050448, - "heading": -0.7564164574676673, - "angularVelocity": -0.0000017399618879895577, - "velocityX": -4.229833033556611, - "velocityY": 1.4264234897286239, - "timestamp": 0.4837644259465528 - }, - { - "x": 6.17836706957884, - "y": 6.340840336571625, - "heading": -0.756416577715043, - "angularVelocity": -0.0000017399618174221652, - "velocityX": -4.229833033568472, - "velocityY": 1.4264234896934709, - "timestamp": 0.5528736296532032 - }, - { - "x": 5.886046676816838, - "y": 6.439419328092803, - "heading": -0.7564166979624138, - "angularVelocity": -0.0000017399617475329905, - "velocityX": -4.229833033568481, - "velocityY": 1.4264234896934656, - "timestamp": 0.6219828333598536 - }, - { - "x": 5.593726284054834, - "y": 6.537998319613979, - "heading": -0.7564168182097798, - "angularVelocity": -0.0000017399616770394642, - "velocityX": -4.229833033568489, - "velocityY": 1.4264234896934602, - "timestamp": 0.691092037066504 - }, - { - "x": 5.30140589129283, - "y": 6.636577311135155, - "heading": -0.7564169384571408, - "angularVelocity": -0.0000017399616046443792, - "velocityX": -4.229833033568497, - "velocityY": 1.4264234896934547, - "timestamp": 0.7602012407731544 - }, - { - "x": 5.009085498530825, - "y": 6.73515630265633, - "heading": -0.7564170587044969, - "angularVelocity": -0.0000017399615346191621, - "velocityX": -4.2298330335685055, - "velocityY": 1.426423489693449, - "timestamp": 0.8293104444798048 - }, - { - "x": 4.716765105768819, - "y": 6.833735294177505, - "heading": -0.7564171789518482, - "angularVelocity": -0.0000017399614632648421, - "velocityX": -4.229833033568514, - "velocityY": 1.4264234896934445, - "timestamp": 0.8984196481864553 - }, - { - "x": 4.424444713006813, - "y": 6.932314285698681, - "heading": -0.7564172991991944, - "angularVelocity": -0.0000017399613926085627, - "velocityX": -4.229833033568522, - "velocityY": 1.426423489693439, - "timestamp": 0.9675288518931057 - }, - { - "x": 4.132124320244807, - "y": 7.030893277219855, - "heading": -0.7564174194465358, - "angularVelocity": -0.000001739961322309266, - "velocityX": -4.22983303356853, - "velocityY": 1.4264234896934327, - "timestamp": 1.036638055599756 - }, - { - "x": 3.8398039274827998, - "y": 7.12947226874103, - "heading": -0.7564175396938725, - "angularVelocity": -0.0000017399612515822951, - "velocityX": -4.229833033568539, - "velocityY": 1.4264234896934282, - "timestamp": 1.1057472593064064 - }, - { - "x": 3.5474835347207923, - "y": 7.228051260262204, - "heading": -0.7564176599412041, - "angularVelocity": -0.0000017399611809751186, - "velocityX": -4.229833033568547, - "velocityY": 1.426423489693423, - "timestamp": 1.1748564630130567 - }, - { - "x": 3.2551631419588065, - "y": 7.3266302517834445, - "heading": -0.7564177801885309, - "angularVelocity": -0.0000017399611103819166, - "velocityX": -4.2298330335682275, - "velocityY": 1.426423489694391, - "timestamp": 1.243965666719707 - }, - { - "x": 2.9628427520154896, - "y": 7.425209251663, - "heading": -0.7564179004358546, - "angularVelocity": -0.0000017399610656267743, - "velocityX": -4.229832992782508, - "velocityY": 1.4264236106379857, - "timestamp": 1.3130748704263573 - }, - { - "x": 2.6708743138170012, - "y": 7.524825811758677, - "heading": -0.756418029492185, - "angularVelocity": -0.0000018674260939442156, - "velocityX": -4.224740302866374, - "velocityY": 1.4414369541649088, - "timestamp": 1.3821840741330076 - }, - { - "x": 2.4213384714317727, - "y": 7.615257168595975, - "heading": -0.8816427368439088, - "angularVelocity": -1.811983073676675, - "velocityX": -3.610746890449494, - "velocityY": 1.3085284157107897, - "timestamp": 1.451293277839658 - }, - { - "x": 2.21148002318275, - "y": 7.683316907406288, - "heading": -1.124131405010496, - "angularVelocity": -3.5087753173352287, - "velocityX": -3.0366208405441126, - "velocityY": 0.9848143975035244, - "timestamp": 1.5204024815463082 - }, - { - "x": 2.0561396273210493, - "y": 7.73280912350277, - "heading": -1.336404883712461, - "angularVelocity": -3.071565975539345, - "velocityX": -2.2477526513122372, - "velocityY": 0.716145078252716, - "timestamp": 1.5895116852529585 - }, - { - "x": 1.9536174387964673, - "y": 7.7649670547651155, - "heading": -1.4902568912138114, - "angularVelocity": -2.2262158909312575, - "velocityX": -1.4834809696225164, - "velocityY": 0.4653205295035193, - "timestamp": 1.6586208889596088 + "x": 5.960220609092856, + "y": 5.797562056573989, + "heading": -0.06470866472909782, + "angularVelocity": -1.004385827300548, + "velocityX": -0.6593506195517254, + "velocityY": 0.30745653866141776, + "timestamp": 0.06442610296783358 + }, + { + "x": 5.875013887029657, + "y": 5.837953498342662, + "heading": -0.18996298217441965, + "angularVelocity": -1.9441548017867587, + "velocityX": -1.3225496830956902, + "velocityY": 0.6269421850463305, + "timestamp": 0.12885220593566715 + }, + { + "x": 5.7464509048802555, + "y": 5.9000054643440745, + "heading": -0.3653560755237046, + "angularVelocity": -2.7223917832940248, + "velocityX": -1.9955107670192456, + "velocityY": 0.9631494556235047, + "timestamp": 0.19327830890350073 + }, + { + "x": 5.573324402058224, + "y": 5.98491057796093, + "heading": -0.5667059270270421, + "angularVelocity": -3.125283731717667, + "velocityX": -2.687210538071336, + "velocityY": 1.3178682196445546, + "timestamp": 0.2577044118713343 + }, + { + "x": 5.358025378598342, + "y": 6.09325759119391, + "heading": -0.7157388690498397, + "angularVelocity": -2.3132385036109704, + "velocityX": -3.3417980219504644, + "velocityY": 1.681725391446945, + "timestamp": 0.3221305148391679 + }, + { + "x": 5.10974960118583, + "y": 6.221473232692178, + "heading": -0.7422160020446714, + "angularVelocity": -0.41096902924659373, + "velocityX": -3.8536519512358116, + "velocityY": 1.9901194638806985, + "timestamp": 0.38655661780700146 + }, + { + "x": 4.851144395786618, + "y": 6.347296032187856, + "heading": -0.7422160714271608, + "angularVelocity": -0.0000010769313405917012, + "velocityX": -4.013981809955608, + "velocityY": 1.9529785863114875, + "timestamp": 0.45098272077483503 + }, + { + "x": 4.592539177857443, + "y": 6.473118805930563, + "heading": -0.742216140809602, + "angularVelocity": -0.0000010769305903693286, + "velocityX": -4.013982004441463, + "velocityY": 1.9529781865826377, + "timestamp": 0.5154088237426686 + }, + { + "x": 4.333933959928216, + "y": 6.598941579673166, + "heading": -0.7422162101920402, + "angularVelocity": -0.0000010769305467155326, + "velocityX": -4.013982004442244, + "velocityY": 1.9529781865810418, + "timestamp": 0.5798349267105022 + }, + { + "x": 4.075328741998988, + "y": 6.724764353415769, + "heading": -0.7422162795744756, + "angularVelocity": -0.0000010769305013217446, + "velocityX": -4.013982004442249, + "velocityY": 1.9529781865810423, + "timestamp": 0.6442610296783358 + }, + { + "x": 3.81672352406976, + "y": 6.850587127158372, + "heading": -0.742216348956908, + "angularVelocity": -0.0000010769304566943578, + "velocityX": -4.013982004442255, + "velocityY": 1.9529781865810436, + "timestamp": 0.7086871326461693 + }, + { + "x": 3.558118306140533, + "y": 6.9764099009009755, + "heading": -0.7422164183393377, + "angularVelocity": -0.00000107693041267148, + "velocityX": -4.01398200444226, + "velocityY": 1.9529781865810443, + "timestamp": 0.7731132356140029 + }, + { + "x": 3.2995130882113037, + "y": 7.102232674643578, + "heading": -0.7422164877217645, + "angularVelocity": -0.0000010769303689487123, + "velocityX": -4.013982004442265, + "velocityY": 1.9529781865810452, + "timestamp": 0.8375393385818365 + }, + { + "x": 3.0409078702821364, + "y": 7.228055448386307, + "heading": -0.7422165571041884, + "angularVelocity": -0.000001076930323970094, + "velocityX": -4.013982004441332, + "velocityY": 1.9529781865829736, + "timestamp": 0.9019654415496701 + }, + { + "x": 2.7823026674788656, + "y": 7.353878253217442, + "heading": -0.7422166264866826, + "angularVelocity": -0.000001076931413528085, + "velocityX": -4.013981769662302, + "velocityY": 1.9529786691266324, + "timestamp": 0.9663915445175036 + }, + { + "x": 2.538390528107496, + "y": 7.480804128718353, + "heading": -0.7823097957487269, + "angularVelocity": -0.6223125009138301, + "velocityX": -3.7859210496271953, + "velocityY": 1.970100155899293, + "timestamp": 1.0308176474853372 + }, + { + "x": 2.327192510284298, + "y": 7.585368263117036, + "heading": -0.9351214205709163, + "angularVelocity": -2.371889929435658, + "velocityX": -3.2781436109622293, + "velocityY": 1.6230088361993256, + "timestamp": 1.0952437504531707 + }, + { + "x": 2.1554295379910258, + "y": 7.666511453035774, + "heading": -1.157342423262931, + "angularVelocity": -3.4492386230929473, + "velocityX": -2.666046282188282, + "velocityY": 1.259476922874733, + "timestamp": 1.1596698534210041 + }, + { + "x": 2.0282580657092444, + "y": 7.725002948328063, + "heading": -1.3526402848428671, + "angularVelocity": -3.0313468079458983, + "velocityX": -1.9739122253797619, + "velocityY": 0.9078850434503648, + "timestamp": 1.2240959563888376 + }, + { + "x": 1.9443452354016104, + "y": 7.762531576291907, + "heading": -1.4954340863267142, + "angularVelocity": -2.2163966918058113, + "velocityX": -1.3024663365022802, + "velocityY": 0.5825065654301872, + "timestamp": 1.288522059356671 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -1.1653937719055905, - "velocityX": -0.7368720990162685, - "velocityY": 0.22819457386250322, - "timestamp": 1.727730092666259 + "angularVelocity": -1.1697469968936178, + "velocityX": -0.6465149789147078, + "velocityY": 0.28258458799089314, + "timestamp": 1.3529481623245045 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -6.888853058407665e-26, - "velocityX": -6.994701561003929e-26, - "velocityY": -4.247670966123929e-27, - "timestamp": 1.7968392963729094 + "angularVelocity": 2.4400528008475806e-24, + "velocityX": -4.766257564014433e-23, + "velocityY": 2.2044925959086942e-23, + "timestamp": 1.417374265292338 } ], "trajectoryWaypoints": [ { "timestamp": 0, "isStopPoint": true, - "x": 7.831524848937988, + "x": 6.0027, "y": 5.777753829956055, "heading": 0, "isInitialGuess": false, "translationConstrained": true, "headingConstrained": true, - "controlIntervalCount": 26 + "controlIntervalCount": 22 }, { - "timestamp": 1.7968392963729094, + "timestamp": 1.417374265292338, "isStopPoint": true, "x": 1.9026927947998047, "y": 7.780737400054932, @@ -17437,9 +17401,9 @@ "usesDefaultFieldObstacles": true, "circleObstacles": [], "eventMarkers": [], - "isTrajectoryStale": false + "isTrajectoryStale": true }, - "amp to f3": { + "amp to f3 ": { "waypoints": [ { "x": 1.9141380786895752, @@ -17451,8 +17415,8 @@ "controlIntervalCount": 18 }, { - "x": 4.512294292449951, - "y": 7.05966329574585, + "x": 4.285635471343994, + "y": 6.203483581542969, "heading": 0, "isInitialGuess": false, "translationConstrained": true, @@ -17460,8 +17424,8 @@ "controlIntervalCount": 9 }, { - "x": 6.229137420654297, - "y": 6.121122360229492, + "x": 5.158218860626221, + "y": 4.629411697387695, "heading": 0, "isInitialGuess": false, "translationConstrained": true, @@ -17469,7 +17433,7 @@ "controlIntervalCount": 10 }, { - "x": 7.945980548858643, + "x": 6.117, "y": 4.083801746368408, "heading": 0, "isInitialGuess": false, @@ -17889,11 +17853,11 @@ "eventMarkers": [], "isTrajectoryStale": true }, - "New Path": { + "zero to midline (test)": { "waypoints": [ { - "x": 5.685999999999998, - "y": 5.582999999999998, + "x": -0.04656301438808441, + "y": -0.008260255679488182, "heading": 0, "isInitialGuess": false, "translationConstrained": true, @@ -17901,8 +17865,8 @@ "controlIntervalCount": 40 }, { - "x": 3.3564069271087646, - "y": 4.082634925842285, + "x": 6.4622, + "y": 2.4239115715026855, "heading": 0, "isInitialGuess": false, "translationConstrained": true, diff --git a/src/main/deploy/choreo/amp to f3.1.traj b/src/main/deploy/choreo/amp to f3 .1.traj similarity index 100% rename from src/main/deploy/choreo/amp to f3.1.traj rename to src/main/deploy/choreo/amp to f3 .1.traj diff --git a/src/main/deploy/choreo/amp to f3.traj b/src/main/deploy/choreo/amp to f3 .traj similarity index 100% rename from src/main/deploy/choreo/amp to f3.traj rename to src/main/deploy/choreo/amp to f3 .traj diff --git a/src/main/deploy/choreo/f2 to amp.1.traj b/src/main/deploy/choreo/f2 to amp.1.traj index 8d7b6dc..076e13a 100644 --- a/src/main/deploy/choreo/f2 to amp.1.traj +++ b/src/main/deploy/choreo/f2 to amp.1.traj @@ -1,247 +1,211 @@ { "samples": [ { - "x": 7.831524848937988, + "x": 6.0027, "y": 5.777753829956055, - "heading": 7.029948882834116e-26, - "angularVelocity": 2.849398599973591e-26, - "velocityX": -5.696194540957051e-26, - "velocityY": -3.034591620800879e-25, + "heading": -3.110893343443771e-23, + "angularVelocity": -4.9155948824066646e-24, + "velocityX": 2.1897737903021007e-23, + "velocityY": -9.118614041203597e-24, "timestamp": 0 }, { - "x": 7.779954908494634, - "y": 5.794474396396209, - "heading": -0.07319301310420766, - "angularVelocity": -1.0590921205646053, - "velocityX": -0.7462094435678169, - "velocityY": 0.2419441339698886, - "timestamp": 0.06910920370665039 - }, - { - "x": 7.676470234042897, - "y": 5.828632018152386, - "heading": -0.21492189956774962, - "angularVelocity": -2.0507961148726617, - "velocityX": -1.4974079992442166, - "velocityY": 0.49425575645708864, - "timestamp": 0.13821840741330077 - }, - { - "x": 7.5202094983036165, - "y": 5.881072211168531, - "heading": -0.41336794916178154, - "angularVelocity": -2.871485112697593, - "velocityX": -2.261069833803386, - "velocityY": 0.758801870134973, - "timestamp": 0.20732761111995116 - }, - { - "x": 7.30957736611775, - "y": 5.952525731358735, - "heading": -0.6421200430409219, - "angularVelocity": -3.3100091103658236, - "velocityX": -3.0478159331706767, - "velocityY": 1.0339219142721563, - "timestamp": 0.27643681482660154 - }, - { - "x": 7.055328146082673, - "y": 6.045103060191937, - "heading": -0.7564162169705557, - "angularVelocity": -1.6538488044919417, - "velocityX": -3.6789487709089363, - "velocityY": 1.3395803144566223, - "timestamp": 0.34554601853325195 - }, - { - "x": 6.7630078551020265, - "y": 6.143682353526842, - "heading": -0.7564163372202867, - "angularVelocity": -0.0000017399958979532222, - "velocityX": -4.229831560807253, - "velocityY": 1.4264278568936668, - "timestamp": 0.41465522223990237 - }, - { - "x": 6.470687462340844, - "y": 6.242261345050448, - "heading": -0.7564164574676673, - "angularVelocity": -0.0000017399618879895577, - "velocityX": -4.229833033556611, - "velocityY": 1.4264234897286239, - "timestamp": 0.4837644259465528 - }, - { - "x": 6.17836706957884, - "y": 6.340840336571625, - "heading": -0.756416577715043, - "angularVelocity": -0.0000017399618174221652, - "velocityX": -4.229833033568472, - "velocityY": 1.4264234896934709, - "timestamp": 0.5528736296532032 - }, - { - "x": 5.886046676816838, - "y": 6.439419328092803, - "heading": -0.7564166979624138, - "angularVelocity": -0.0000017399617475329905, - "velocityX": -4.229833033568481, - "velocityY": 1.4264234896934656, - "timestamp": 0.6219828333598536 - }, - { - "x": 5.593726284054834, - "y": 6.537998319613979, - "heading": -0.7564168182097798, - "angularVelocity": -0.0000017399616770394642, - "velocityX": -4.229833033568489, - "velocityY": 1.4264234896934602, - "timestamp": 0.691092037066504 - }, - { - "x": 5.30140589129283, - "y": 6.636577311135155, - "heading": -0.7564169384571408, - "angularVelocity": -0.0000017399616046443792, - "velocityX": -4.229833033568497, - "velocityY": 1.4264234896934547, - "timestamp": 0.7602012407731544 - }, - { - "x": 5.009085498530825, - "y": 6.73515630265633, - "heading": -0.7564170587044969, - "angularVelocity": -0.0000017399615346191621, - "velocityX": -4.2298330335685055, - "velocityY": 1.426423489693449, - "timestamp": 0.8293104444798048 - }, - { - "x": 4.716765105768819, - "y": 6.833735294177505, - "heading": -0.7564171789518482, - "angularVelocity": -0.0000017399614632648421, - "velocityX": -4.229833033568514, - "velocityY": 1.4264234896934445, - "timestamp": 0.8984196481864553 - }, - { - "x": 4.424444713006813, - "y": 6.932314285698681, - "heading": -0.7564172991991944, - "angularVelocity": -0.0000017399613926085627, - "velocityX": -4.229833033568522, - "velocityY": 1.426423489693439, - "timestamp": 0.9675288518931057 - }, - { - "x": 4.132124320244807, - "y": 7.030893277219855, - "heading": -0.7564174194465358, - "angularVelocity": -0.000001739961322309266, - "velocityX": -4.22983303356853, - "velocityY": 1.4264234896934327, - "timestamp": 1.036638055599756 - }, - { - "x": 3.8398039274827998, - "y": 7.12947226874103, - "heading": -0.7564175396938725, - "angularVelocity": -0.0000017399612515822951, - "velocityX": -4.229833033568539, - "velocityY": 1.4264234896934282, - "timestamp": 1.1057472593064064 - }, - { - "x": 3.5474835347207923, - "y": 7.228051260262204, - "heading": -0.7564176599412041, - "angularVelocity": -0.0000017399611809751186, - "velocityX": -4.229833033568547, - "velocityY": 1.426423489693423, - "timestamp": 1.1748564630130567 - }, - { - "x": 3.2551631419588065, - "y": 7.3266302517834445, - "heading": -0.7564177801885309, - "angularVelocity": -0.0000017399611103819166, - "velocityX": -4.2298330335682275, - "velocityY": 1.426423489694391, - "timestamp": 1.243965666719707 - }, - { - "x": 2.9628427520154896, - "y": 7.425209251663, - "heading": -0.7564179004358546, - "angularVelocity": -0.0000017399610656267743, - "velocityX": -4.229832992782508, - "velocityY": 1.4264236106379857, - "timestamp": 1.3130748704263573 - }, - { - "x": 2.6708743138170012, - "y": 7.524825811758677, - "heading": -0.756418029492185, - "angularVelocity": -0.0000018674260939442156, - "velocityX": -4.224740302866374, - "velocityY": 1.4414369541649088, - "timestamp": 1.3821840741330076 - }, - { - "x": 2.4213384714317727, - "y": 7.615257168595975, - "heading": -0.8816427368439088, - "angularVelocity": -1.811983073676675, - "velocityX": -3.610746890449494, - "velocityY": 1.3085284157107897, - "timestamp": 1.451293277839658 - }, - { - "x": 2.21148002318275, - "y": 7.683316907406288, - "heading": -1.124131405010496, - "angularVelocity": -3.5087753173352287, - "velocityX": -3.0366208405441126, - "velocityY": 0.9848143975035244, - "timestamp": 1.5204024815463082 - }, - { - "x": 2.0561396273210493, - "y": 7.73280912350277, - "heading": -1.336404883712461, - "angularVelocity": -3.071565975539345, - "velocityX": -2.2477526513122372, - "velocityY": 0.716145078252716, - "timestamp": 1.5895116852529585 - }, - { - "x": 1.9536174387964673, - "y": 7.7649670547651155, - "heading": -1.4902568912138114, - "angularVelocity": -2.2262158909312575, - "velocityX": -1.4834809696225164, - "velocityY": 0.4653205295035193, - "timestamp": 1.6586208889596088 + "x": 5.960220609092856, + "y": 5.797562056573989, + "heading": -0.06470866472909782, + "angularVelocity": -1.004385827300548, + "velocityX": -0.6593506195517254, + "velocityY": 0.30745653866141776, + "timestamp": 0.06442610296783358 + }, + { + "x": 5.875013887029657, + "y": 5.837953498342662, + "heading": -0.18996298217441965, + "angularVelocity": -1.9441548017867587, + "velocityX": -1.3225496830956902, + "velocityY": 0.6269421850463305, + "timestamp": 0.12885220593566715 + }, + { + "x": 5.7464509048802555, + "y": 5.9000054643440745, + "heading": -0.3653560755237046, + "angularVelocity": -2.7223917832940248, + "velocityX": -1.9955107670192456, + "velocityY": 0.9631494556235047, + "timestamp": 0.19327830890350073 + }, + { + "x": 5.573324402058224, + "y": 5.98491057796093, + "heading": -0.5667059270270421, + "angularVelocity": -3.125283731717667, + "velocityX": -2.687210538071336, + "velocityY": 1.3178682196445546, + "timestamp": 0.2577044118713343 + }, + { + "x": 5.358025378598342, + "y": 6.09325759119391, + "heading": -0.7157388690498397, + "angularVelocity": -2.3132385036109704, + "velocityX": -3.3417980219504644, + "velocityY": 1.681725391446945, + "timestamp": 0.3221305148391679 + }, + { + "x": 5.10974960118583, + "y": 6.221473232692178, + "heading": -0.7422160020446714, + "angularVelocity": -0.41096902924659373, + "velocityX": -3.8536519512358116, + "velocityY": 1.9901194638806985, + "timestamp": 0.38655661780700146 + }, + { + "x": 4.851144395786618, + "y": 6.347296032187856, + "heading": -0.7422160714271608, + "angularVelocity": -0.0000010769313405917012, + "velocityX": -4.013981809955608, + "velocityY": 1.9529785863114875, + "timestamp": 0.45098272077483503 + }, + { + "x": 4.592539177857443, + "y": 6.473118805930563, + "heading": -0.742216140809602, + "angularVelocity": -0.0000010769305903693286, + "velocityX": -4.013982004441463, + "velocityY": 1.9529781865826377, + "timestamp": 0.5154088237426686 + }, + { + "x": 4.333933959928216, + "y": 6.598941579673166, + "heading": -0.7422162101920402, + "angularVelocity": -0.0000010769305467155326, + "velocityX": -4.013982004442244, + "velocityY": 1.9529781865810418, + "timestamp": 0.5798349267105022 + }, + { + "x": 4.075328741998988, + "y": 6.724764353415769, + "heading": -0.7422162795744756, + "angularVelocity": -0.0000010769305013217446, + "velocityX": -4.013982004442249, + "velocityY": 1.9529781865810423, + "timestamp": 0.6442610296783358 + }, + { + "x": 3.81672352406976, + "y": 6.850587127158372, + "heading": -0.742216348956908, + "angularVelocity": -0.0000010769304566943578, + "velocityX": -4.013982004442255, + "velocityY": 1.9529781865810436, + "timestamp": 0.7086871326461693 + }, + { + "x": 3.558118306140533, + "y": 6.9764099009009755, + "heading": -0.7422164183393377, + "angularVelocity": -0.00000107693041267148, + "velocityX": -4.01398200444226, + "velocityY": 1.9529781865810443, + "timestamp": 0.7731132356140029 + }, + { + "x": 3.2995130882113037, + "y": 7.102232674643578, + "heading": -0.7422164877217645, + "angularVelocity": -0.0000010769303689487123, + "velocityX": -4.013982004442265, + "velocityY": 1.9529781865810452, + "timestamp": 0.8375393385818365 + }, + { + "x": 3.0409078702821364, + "y": 7.228055448386307, + "heading": -0.7422165571041884, + "angularVelocity": -0.000001076930323970094, + "velocityX": -4.013982004441332, + "velocityY": 1.9529781865829736, + "timestamp": 0.9019654415496701 + }, + { + "x": 2.7823026674788656, + "y": 7.353878253217442, + "heading": -0.7422166264866826, + "angularVelocity": -0.000001076931413528085, + "velocityX": -4.013981769662302, + "velocityY": 1.9529786691266324, + "timestamp": 0.9663915445175036 + }, + { + "x": 2.538390528107496, + "y": 7.480804128718353, + "heading": -0.7823097957487269, + "angularVelocity": -0.6223125009138301, + "velocityX": -3.7859210496271953, + "velocityY": 1.970100155899293, + "timestamp": 1.0308176474853372 + }, + { + "x": 2.327192510284298, + "y": 7.585368263117036, + "heading": -0.9351214205709163, + "angularVelocity": -2.371889929435658, + "velocityX": -3.2781436109622293, + "velocityY": 1.6230088361993256, + "timestamp": 1.0952437504531707 + }, + { + "x": 2.1554295379910258, + "y": 7.666511453035774, + "heading": -1.157342423262931, + "angularVelocity": -3.4492386230929473, + "velocityX": -2.666046282188282, + "velocityY": 1.259476922874733, + "timestamp": 1.1596698534210041 + }, + { + "x": 2.0282580657092444, + "y": 7.725002948328063, + "heading": -1.3526402848428671, + "angularVelocity": -3.0313468079458983, + "velocityX": -1.9739122253797619, + "velocityY": 0.9078850434503648, + "timestamp": 1.2240959563888376 + }, + { + "x": 1.9443452354016104, + "y": 7.762531576291907, + "heading": -1.4954340863267142, + "angularVelocity": -2.2163966918058113, + "velocityX": -1.3024663365022802, + "velocityY": 0.5825065654301872, + "timestamp": 1.288522059356671 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -1.1653937719055905, - "velocityX": -0.7368720990162685, - "velocityY": 0.22819457386250322, - "timestamp": 1.727730092666259 + "angularVelocity": -1.1697469968936178, + "velocityX": -0.6465149789147078, + "velocityY": 0.28258458799089314, + "timestamp": 1.3529481623245045 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -6.888853058407665e-26, - "velocityX": -6.994701561003929e-26, - "velocityY": -4.247670966123929e-27, - "timestamp": 1.7968392963729094 + "angularVelocity": 2.4400528008475806e-24, + "velocityX": -4.766257564014433e-23, + "velocityY": 2.2044925959086942e-23, + "timestamp": 1.417374265292338 } ], "eventMarkers": [] diff --git a/src/main/deploy/choreo/f2 to amp.traj b/src/main/deploy/choreo/f2 to amp.traj index 8d7b6dc..076e13a 100644 --- a/src/main/deploy/choreo/f2 to amp.traj +++ b/src/main/deploy/choreo/f2 to amp.traj @@ -1,247 +1,211 @@ { "samples": [ { - "x": 7.831524848937988, + "x": 6.0027, "y": 5.777753829956055, - "heading": 7.029948882834116e-26, - "angularVelocity": 2.849398599973591e-26, - "velocityX": -5.696194540957051e-26, - "velocityY": -3.034591620800879e-25, + "heading": -3.110893343443771e-23, + "angularVelocity": -4.9155948824066646e-24, + "velocityX": 2.1897737903021007e-23, + "velocityY": -9.118614041203597e-24, "timestamp": 0 }, { - "x": 7.779954908494634, - "y": 5.794474396396209, - "heading": -0.07319301310420766, - "angularVelocity": -1.0590921205646053, - "velocityX": -0.7462094435678169, - "velocityY": 0.2419441339698886, - "timestamp": 0.06910920370665039 - }, - { - "x": 7.676470234042897, - "y": 5.828632018152386, - "heading": -0.21492189956774962, - "angularVelocity": -2.0507961148726617, - "velocityX": -1.4974079992442166, - "velocityY": 0.49425575645708864, - "timestamp": 0.13821840741330077 - }, - { - "x": 7.5202094983036165, - "y": 5.881072211168531, - "heading": -0.41336794916178154, - "angularVelocity": -2.871485112697593, - "velocityX": -2.261069833803386, - "velocityY": 0.758801870134973, - "timestamp": 0.20732761111995116 - }, - { - "x": 7.30957736611775, - "y": 5.952525731358735, - "heading": -0.6421200430409219, - "angularVelocity": -3.3100091103658236, - "velocityX": -3.0478159331706767, - "velocityY": 1.0339219142721563, - "timestamp": 0.27643681482660154 - }, - { - "x": 7.055328146082673, - "y": 6.045103060191937, - "heading": -0.7564162169705557, - "angularVelocity": -1.6538488044919417, - "velocityX": -3.6789487709089363, - "velocityY": 1.3395803144566223, - "timestamp": 0.34554601853325195 - }, - { - "x": 6.7630078551020265, - "y": 6.143682353526842, - "heading": -0.7564163372202867, - "angularVelocity": -0.0000017399958979532222, - "velocityX": -4.229831560807253, - "velocityY": 1.4264278568936668, - "timestamp": 0.41465522223990237 - }, - { - "x": 6.470687462340844, - "y": 6.242261345050448, - "heading": -0.7564164574676673, - "angularVelocity": -0.0000017399618879895577, - "velocityX": -4.229833033556611, - "velocityY": 1.4264234897286239, - "timestamp": 0.4837644259465528 - }, - { - "x": 6.17836706957884, - "y": 6.340840336571625, - "heading": -0.756416577715043, - "angularVelocity": -0.0000017399618174221652, - "velocityX": -4.229833033568472, - "velocityY": 1.4264234896934709, - "timestamp": 0.5528736296532032 - }, - { - "x": 5.886046676816838, - "y": 6.439419328092803, - "heading": -0.7564166979624138, - "angularVelocity": -0.0000017399617475329905, - "velocityX": -4.229833033568481, - "velocityY": 1.4264234896934656, - "timestamp": 0.6219828333598536 - }, - { - "x": 5.593726284054834, - "y": 6.537998319613979, - "heading": -0.7564168182097798, - "angularVelocity": -0.0000017399616770394642, - "velocityX": -4.229833033568489, - "velocityY": 1.4264234896934602, - "timestamp": 0.691092037066504 - }, - { - "x": 5.30140589129283, - "y": 6.636577311135155, - "heading": -0.7564169384571408, - "angularVelocity": -0.0000017399616046443792, - "velocityX": -4.229833033568497, - "velocityY": 1.4264234896934547, - "timestamp": 0.7602012407731544 - }, - { - "x": 5.009085498530825, - "y": 6.73515630265633, - "heading": -0.7564170587044969, - "angularVelocity": -0.0000017399615346191621, - "velocityX": -4.2298330335685055, - "velocityY": 1.426423489693449, - "timestamp": 0.8293104444798048 - }, - { - "x": 4.716765105768819, - "y": 6.833735294177505, - "heading": -0.7564171789518482, - "angularVelocity": -0.0000017399614632648421, - "velocityX": -4.229833033568514, - "velocityY": 1.4264234896934445, - "timestamp": 0.8984196481864553 - }, - { - "x": 4.424444713006813, - "y": 6.932314285698681, - "heading": -0.7564172991991944, - "angularVelocity": -0.0000017399613926085627, - "velocityX": -4.229833033568522, - "velocityY": 1.426423489693439, - "timestamp": 0.9675288518931057 - }, - { - "x": 4.132124320244807, - "y": 7.030893277219855, - "heading": -0.7564174194465358, - "angularVelocity": -0.000001739961322309266, - "velocityX": -4.22983303356853, - "velocityY": 1.4264234896934327, - "timestamp": 1.036638055599756 - }, - { - "x": 3.8398039274827998, - "y": 7.12947226874103, - "heading": -0.7564175396938725, - "angularVelocity": -0.0000017399612515822951, - "velocityX": -4.229833033568539, - "velocityY": 1.4264234896934282, - "timestamp": 1.1057472593064064 - }, - { - "x": 3.5474835347207923, - "y": 7.228051260262204, - "heading": -0.7564176599412041, - "angularVelocity": -0.0000017399611809751186, - "velocityX": -4.229833033568547, - "velocityY": 1.426423489693423, - "timestamp": 1.1748564630130567 - }, - { - "x": 3.2551631419588065, - "y": 7.3266302517834445, - "heading": -0.7564177801885309, - "angularVelocity": -0.0000017399611103819166, - "velocityX": -4.2298330335682275, - "velocityY": 1.426423489694391, - "timestamp": 1.243965666719707 - }, - { - "x": 2.9628427520154896, - "y": 7.425209251663, - "heading": -0.7564179004358546, - "angularVelocity": -0.0000017399610656267743, - "velocityX": -4.229832992782508, - "velocityY": 1.4264236106379857, - "timestamp": 1.3130748704263573 - }, - { - "x": 2.6708743138170012, - "y": 7.524825811758677, - "heading": -0.756418029492185, - "angularVelocity": -0.0000018674260939442156, - "velocityX": -4.224740302866374, - "velocityY": 1.4414369541649088, - "timestamp": 1.3821840741330076 - }, - { - "x": 2.4213384714317727, - "y": 7.615257168595975, - "heading": -0.8816427368439088, - "angularVelocity": -1.811983073676675, - "velocityX": -3.610746890449494, - "velocityY": 1.3085284157107897, - "timestamp": 1.451293277839658 - }, - { - "x": 2.21148002318275, - "y": 7.683316907406288, - "heading": -1.124131405010496, - "angularVelocity": -3.5087753173352287, - "velocityX": -3.0366208405441126, - "velocityY": 0.9848143975035244, - "timestamp": 1.5204024815463082 - }, - { - "x": 2.0561396273210493, - "y": 7.73280912350277, - "heading": -1.336404883712461, - "angularVelocity": -3.071565975539345, - "velocityX": -2.2477526513122372, - "velocityY": 0.716145078252716, - "timestamp": 1.5895116852529585 - }, - { - "x": 1.9536174387964673, - "y": 7.7649670547651155, - "heading": -1.4902568912138114, - "angularVelocity": -2.2262158909312575, - "velocityX": -1.4834809696225164, - "velocityY": 0.4653205295035193, - "timestamp": 1.6586208889596088 + "x": 5.960220609092856, + "y": 5.797562056573989, + "heading": -0.06470866472909782, + "angularVelocity": -1.004385827300548, + "velocityX": -0.6593506195517254, + "velocityY": 0.30745653866141776, + "timestamp": 0.06442610296783358 + }, + { + "x": 5.875013887029657, + "y": 5.837953498342662, + "heading": -0.18996298217441965, + "angularVelocity": -1.9441548017867587, + "velocityX": -1.3225496830956902, + "velocityY": 0.6269421850463305, + "timestamp": 0.12885220593566715 + }, + { + "x": 5.7464509048802555, + "y": 5.9000054643440745, + "heading": -0.3653560755237046, + "angularVelocity": -2.7223917832940248, + "velocityX": -1.9955107670192456, + "velocityY": 0.9631494556235047, + "timestamp": 0.19327830890350073 + }, + { + "x": 5.573324402058224, + "y": 5.98491057796093, + "heading": -0.5667059270270421, + "angularVelocity": -3.125283731717667, + "velocityX": -2.687210538071336, + "velocityY": 1.3178682196445546, + "timestamp": 0.2577044118713343 + }, + { + "x": 5.358025378598342, + "y": 6.09325759119391, + "heading": -0.7157388690498397, + "angularVelocity": -2.3132385036109704, + "velocityX": -3.3417980219504644, + "velocityY": 1.681725391446945, + "timestamp": 0.3221305148391679 + }, + { + "x": 5.10974960118583, + "y": 6.221473232692178, + "heading": -0.7422160020446714, + "angularVelocity": -0.41096902924659373, + "velocityX": -3.8536519512358116, + "velocityY": 1.9901194638806985, + "timestamp": 0.38655661780700146 + }, + { + "x": 4.851144395786618, + "y": 6.347296032187856, + "heading": -0.7422160714271608, + "angularVelocity": -0.0000010769313405917012, + "velocityX": -4.013981809955608, + "velocityY": 1.9529785863114875, + "timestamp": 0.45098272077483503 + }, + { + "x": 4.592539177857443, + "y": 6.473118805930563, + "heading": -0.742216140809602, + "angularVelocity": -0.0000010769305903693286, + "velocityX": -4.013982004441463, + "velocityY": 1.9529781865826377, + "timestamp": 0.5154088237426686 + }, + { + "x": 4.333933959928216, + "y": 6.598941579673166, + "heading": -0.7422162101920402, + "angularVelocity": -0.0000010769305467155326, + "velocityX": -4.013982004442244, + "velocityY": 1.9529781865810418, + "timestamp": 0.5798349267105022 + }, + { + "x": 4.075328741998988, + "y": 6.724764353415769, + "heading": -0.7422162795744756, + "angularVelocity": -0.0000010769305013217446, + "velocityX": -4.013982004442249, + "velocityY": 1.9529781865810423, + "timestamp": 0.6442610296783358 + }, + { + "x": 3.81672352406976, + "y": 6.850587127158372, + "heading": -0.742216348956908, + "angularVelocity": -0.0000010769304566943578, + "velocityX": -4.013982004442255, + "velocityY": 1.9529781865810436, + "timestamp": 0.7086871326461693 + }, + { + "x": 3.558118306140533, + "y": 6.9764099009009755, + "heading": -0.7422164183393377, + "angularVelocity": -0.00000107693041267148, + "velocityX": -4.01398200444226, + "velocityY": 1.9529781865810443, + "timestamp": 0.7731132356140029 + }, + { + "x": 3.2995130882113037, + "y": 7.102232674643578, + "heading": -0.7422164877217645, + "angularVelocity": -0.0000010769303689487123, + "velocityX": -4.013982004442265, + "velocityY": 1.9529781865810452, + "timestamp": 0.8375393385818365 + }, + { + "x": 3.0409078702821364, + "y": 7.228055448386307, + "heading": -0.7422165571041884, + "angularVelocity": -0.000001076930323970094, + "velocityX": -4.013982004441332, + "velocityY": 1.9529781865829736, + "timestamp": 0.9019654415496701 + }, + { + "x": 2.7823026674788656, + "y": 7.353878253217442, + "heading": -0.7422166264866826, + "angularVelocity": -0.000001076931413528085, + "velocityX": -4.013981769662302, + "velocityY": 1.9529786691266324, + "timestamp": 0.9663915445175036 + }, + { + "x": 2.538390528107496, + "y": 7.480804128718353, + "heading": -0.7823097957487269, + "angularVelocity": -0.6223125009138301, + "velocityX": -3.7859210496271953, + "velocityY": 1.970100155899293, + "timestamp": 1.0308176474853372 + }, + { + "x": 2.327192510284298, + "y": 7.585368263117036, + "heading": -0.9351214205709163, + "angularVelocity": -2.371889929435658, + "velocityX": -3.2781436109622293, + "velocityY": 1.6230088361993256, + "timestamp": 1.0952437504531707 + }, + { + "x": 2.1554295379910258, + "y": 7.666511453035774, + "heading": -1.157342423262931, + "angularVelocity": -3.4492386230929473, + "velocityX": -2.666046282188282, + "velocityY": 1.259476922874733, + "timestamp": 1.1596698534210041 + }, + { + "x": 2.0282580657092444, + "y": 7.725002948328063, + "heading": -1.3526402848428671, + "angularVelocity": -3.0313468079458983, + "velocityX": -1.9739122253797619, + "velocityY": 0.9078850434503648, + "timestamp": 1.2240959563888376 + }, + { + "x": 1.9443452354016104, + "y": 7.762531576291907, + "heading": -1.4954340863267142, + "angularVelocity": -2.2163966918058113, + "velocityX": -1.3024663365022802, + "velocityY": 0.5825065654301872, + "timestamp": 1.288522059356671 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -1.1653937719055905, - "velocityX": -0.7368720990162685, - "velocityY": 0.22819457386250322, - "timestamp": 1.727730092666259 + "angularVelocity": -1.1697469968936178, + "velocityX": -0.6465149789147078, + "velocityY": 0.28258458799089314, + "timestamp": 1.3529481623245045 }, { "x": 1.902692794799805, "y": 7.780737400054932, "heading": -1.5707963267948966, - "angularVelocity": -6.888853058407665e-26, - "velocityX": -6.994701561003929e-26, - "velocityY": -4.247670966123929e-27, - "timestamp": 1.7968392963729094 + "angularVelocity": 2.4400528008475806e-24, + "velocityX": -4.766257564014433e-23, + "velocityY": 2.2044925959086942e-23, + "timestamp": 1.417374265292338 } ], "eventMarkers": [] diff --git a/src/main/java/team3647/frc2024/auto/Turn90/.gitignore b/src/main/java/team3647/frc2024/auto/Turn90/.gitignore new file mode 100644 index 0000000..5528d4f --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/.gitignore @@ -0,0 +1,178 @@ +# This gitignore has been specially created by the WPILib team. +# If you remove items from this file, intellisense might break. + +### C++ ### +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### Gradle ### +.gradle +/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +# # VS Code Specific Java Settings +# DO NOT REMOVE .classpath and .project +.classpath +.project +.settings/ +bin/ + +# IntelliJ +*.iml +*.ipr +*.iws +.idea/ +out/ + +# Fleet +.fleet + +# Simulation GUI and other tools window save file +*-window.json + +# Simulation data log directory +logs/ + +# Folder that has CTRE Phoenix Sim device config storage +ctre_sim/ diff --git a/src/main/java/team3647/frc2024/auto/Turn90/.vscode/launch.json b/src/main/java/team3647/frc2024/auto/Turn90/.vscode/launch.json new file mode 100644 index 0000000..c9c9713 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/.vscode/launch.json @@ -0,0 +1,21 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + + { + "type": "wpilib", + "name": "WPILib Desktop Debug", + "request": "launch", + "desktop": true, + }, + { + "type": "wpilib", + "name": "WPILib roboRIO Debug", + "request": "launch", + "desktop": false, + } + ] +} diff --git a/src/main/java/team3647/frc2024/auto/Turn90/.vscode/settings.json b/src/main/java/team3647/frc2024/auto/Turn90/.vscode/settings.json new file mode 100644 index 0000000..4ed293b --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/.vscode/settings.json @@ -0,0 +1,29 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic", + "java.server.launchMode": "Standard", + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "bin/": true, + "**/.classpath": true, + "**/.project": true, + "**/.settings": true, + "**/.factorypath": true, + "**/*~": true + }, + "java.test.config": [ + { + "name": "WPIlibUnitTests", + "workingDirectory": "${workspaceFolder}/build/jni/release", + "vmargs": [ "-Djava.library.path=${workspaceFolder}/build/jni/release" ], + "env": { + "LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release" , + "DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release" + } + }, + ], + "java.test.defaultConfig": "WPIlibUnitTests" +} diff --git a/src/main/java/team3647/frc2024/auto/Turn90/.wpilib/wpilib_preferences.json b/src/main/java/team3647/frc2024/auto/Turn90/.wpilib/wpilib_preferences.json new file mode 100644 index 0000000..28a703f --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/.wpilib/wpilib_preferences.json @@ -0,0 +1,6 @@ +{ + "enableCppIntellisense": false, + "currentLanguage": "java", + "projectYear": "2024", + "teamNumber": 3647 +} \ No newline at end of file diff --git a/src/main/java/team3647/frc2024/auto/Turn90/WPILib-License.md b/src/main/java/team3647/frc2024/auto/Turn90/WPILib-License.md new file mode 100644 index 0000000..645e542 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/WPILib-License.md @@ -0,0 +1,24 @@ +Copyright (c) 2009-2024 FIRST and other WPILib contributors +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of FIRST, WPILib, nor the names of other WPILib + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY FIRST AND OTHER WPILIB CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/main/java/team3647/frc2024/auto/Turn90/build.gradle b/src/main/java/team3647/frc2024/auto/Turn90/build.gradle new file mode 100644 index 0000000..2348bae --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/build.gradle @@ -0,0 +1,101 @@ +plugins { + id "java" + id "edu.wpi.first.GradleRIO" version "2024.2.1" +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +def ROBOT_MAIN_CLASS = "frc.robot.Main" + +// Define my targets (RoboRIO) and artifacts (deployable files) +// This is added by GradleRIO's backing project DeployUtils. +deploy { + targets { + roborio(getTargetTypeClass('RoboRIO')) { + // Team number is loaded either from the .wpilib/wpilib_preferences.json + // or from command line. If not found an exception will be thrown. + // You can use getTeamOrDefault(team) instead of getTeamNumber if you + // want to store a team number in this file. + team = project.frc.getTeamNumber() + debug = project.frc.getDebugOrDefault(false) + + artifacts { + // First part is artifact name, 2nd is artifact type + // getTargetTypeClass is a shortcut to get the class type using a string + + frcJava(getArtifactTypeClass('FRCJavaArtifact')) { + } + + // Static files artifact + frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { + files = project.fileTree('src/main/deploy') + directory = '/home/lvuser/deploy' + } + } + } + } +} + +def deployArtifact = deploy.targets.roborio.artifacts.frcJava + +// Set to true to use debug for JNI. +wpi.java.debugJni = false + +// Set this to true to enable desktop support. +def includeDesktopSupport = false + +// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries. +// Also defines JUnit 5. +dependencies { + implementation wpi.java.deps.wpilib() + implementation wpi.java.vendor.java() + + roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio) + roborioDebug wpi.java.vendor.jniDebug(wpi.platforms.roborio) + + roborioRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.roborio) + roborioRelease wpi.java.vendor.jniRelease(wpi.platforms.roborio) + + nativeDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop) + nativeDebug wpi.java.vendor.jniDebug(wpi.platforms.desktop) + simulationDebug wpi.sim.enableDebug() + + nativeRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.desktop) + nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop) + simulationRelease wpi.sim.enableRelease() + + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +test { + useJUnitPlatform() + systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' +} + +// Simulation configuration (e.g. environment variables). +wpi.sim.addGui().defaultEnabled = true +wpi.sim.addDriverstation() + +// Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar') +// in order to make them all available at runtime. Also adding the manifest so WPILib +// knows where to look for our Robot Class. +jar { + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + from sourceSets.main.allSource + manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS) + duplicatesStrategy = DuplicatesStrategy.INCLUDE +} + +// Configure jar and deploy tasks +deployArtifact.jarTask = jar +wpi.java.configureExecutableTasks(jar) +wpi.java.configureTestTasks(test) + +// Configure string concat to always inline compile +tasks.withType(JavaCompile) { + options.compilerArgs.add '-XDstringConcat=inline' +} diff --git a/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.jar b/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.properties b/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..5e82d67 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=permwrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=permwrapper/dists diff --git a/src/main/java/team3647/frc2024/auto/Turn90/gradlew b/src/main/java/team3647/frc2024/auto/Turn90/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/main/java/team3647/frc2024/auto/Turn90/gradlew.bat b/src/main/java/team3647/frc2024/auto/Turn90/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/team3647/frc2024/auto/Turn90/settings.gradle b/src/main/java/team3647/frc2024/auto/Turn90/settings.gradle new file mode 100644 index 0000000..d94f73c --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/settings.gradle @@ -0,0 +1,30 @@ +import org.gradle.internal.os.OperatingSystem + +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + String frcYear = '2024' + File frcHome + if (OperatingSystem.current().isWindows()) { + String publicFolder = System.getenv('PUBLIC') + if (publicFolder == null) { + publicFolder = "C:\\Users\\Public" + } + def homeRoot = new File(publicFolder, "wpilib") + frcHome = new File(homeRoot, frcYear) + } else { + def userFolder = System.getProperty("user.home") + def homeRoot = new File(userFolder, "wpilib") + frcHome = new File(homeRoot, frcYear) + } + def frcHomeMaven = new File(frcHome, 'maven') + maven { + name 'frcHome' + url frcHomeMaven + } + } +} + +Properties props = System.getProperties(); +props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true"); diff --git a/src/main/java/team3647/frc2024/auto/Turn90/src/main/deploy/example.txt b/src/main/java/team3647/frc2024/auto/Turn90/src/main/deploy/example.txt new file mode 100644 index 0000000..bb82515 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/src/main/deploy/example.txt @@ -0,0 +1,3 @@ +Files placed in this directory will be deployed to the RoboRIO into the +'deploy' directory in the home folder. Use the 'Filesystem.getDeployDirectory' wpilib function +to get a proper path relative to the deploy directory. \ No newline at end of file diff --git a/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Main.java b/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Main.java new file mode 100644 index 0000000..8776e5d --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Main.java @@ -0,0 +1,25 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package frc.robot; + +import edu.wpi.first.wpilibj.RobotBase; + +/** + * Do NOT add any static variables to this class, or any initialization at all. Unless you know what + * you are doing, do not modify this file except to change the parameter class to the startRobot + * call. + */ +public final class Main { + private Main() {} + + /** + * Main initialization function. Do not perform any initialization here. + * + *

If you change your main robot class, change the parameter type. + */ + public static void main(String... args) { + RobotBase.startRobot(Robot::new); + } +} diff --git a/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Robot.java b/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Robot.java new file mode 100644 index 0000000..ddb8a78 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/src/main/java/frc/robot/Robot.java @@ -0,0 +1,64 @@ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. + +package frc.robot; + +import com.revrobotics.CANSparkMax; +import com.revrobotics.CANSparkLowLevel.MotorType; + +import edu.wpi.first.wpilibj.TimedRobot; + +/** + * The VM is configured to automatically run this class, and to call the functions corresponding to + * each mode, as described in the TimedRobot documentation. If you change the name of this class or + * the package after creating this project, you must also update the build.gradle file in the + * project. + */ +public class Robot extends TimedRobot { + + /** + * This function is run when the robot is first started up and should be used for any + * initialization code. + */ + + @Override + public void robotInit() { + + } + + @Override + public void robotPeriodic() {} + + @Override + public void autonomousInit() {} + + @Override + public void autonomousPeriodic() { + + } + + @Override + public void teleopInit() {} + + @Override + public void teleopPeriodic() {} + + @Override + public void disabledInit() {} + + @Override + public void disabledPeriodic() {} + + @Override + public void testInit() {} + + @Override + public void testPeriodic() {} + + @Override + public void simulationInit() {} + + @Override + public void simulationPeriodic() {} +} diff --git a/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/REVLib.json b/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/REVLib.json new file mode 100644 index 0000000..f85acd4 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/REVLib.json @@ -0,0 +1,74 @@ +{ + "fileName": "REVLib.json", + "name": "REVLib", + "version": "2024.2.4", + "frcYear": "2024", + "uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb", + "mavenUrls": [ + "https://maven.revrobotics.com/" + ], + "jsonUrl": "https://software-metadata.revrobotics.com/REVLib-2024.json", + "javaDependencies": [ + { + "groupId": "com.revrobotics.frc", + "artifactId": "REVLib-java", + "version": "2024.2.4" + } + ], + "jniDependencies": [ + { + "groupId": "com.revrobotics.frc", + "artifactId": "REVLib-driver", + "version": "2024.2.4", + "skipInvalidPlatforms": true, + "isJar": false, + "validPlatforms": [ + "windowsx86-64", + "windowsx86", + "linuxarm64", + "linuxx86-64", + "linuxathena", + "linuxarm32", + "osxuniversal" + ] + } + ], + "cppDependencies": [ + { + "groupId": "com.revrobotics.frc", + "artifactId": "REVLib-cpp", + "version": "2024.2.4", + "libName": "REVLib", + "headerClassifier": "headers", + "sharedLibrary": false, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "windowsx86-64", + "windowsx86", + "linuxarm64", + "linuxx86-64", + "linuxathena", + "linuxarm32", + "osxuniversal" + ] + }, + { + "groupId": "com.revrobotics.frc", + "artifactId": "REVLib-driver", + "version": "2024.2.4", + "libName": "REVLibDriver", + "headerClassifier": "headers", + "sharedLibrary": false, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "windowsx86-64", + "windowsx86", + "linuxarm64", + "linuxx86-64", + "linuxathena", + "linuxarm32", + "osxuniversal" + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/WPILibNewCommands.json b/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/WPILibNewCommands.json new file mode 100644 index 0000000..67bf389 --- /dev/null +++ b/src/main/java/team3647/frc2024/auto/Turn90/vendordeps/WPILibNewCommands.json @@ -0,0 +1,38 @@ +{ + "fileName": "WPILibNewCommands.json", + "name": "WPILib-New-Commands", + "version": "1.0.0", + "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266", + "frcYear": "2024", + "mavenUrls": [], + "jsonUrl": "", + "javaDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-java", + "version": "wpilib" + } + ], + "jniDependencies": [], + "cppDependencies": [ + { + "groupId": "edu.wpi.first.wpilibNewCommands", + "artifactId": "wpilibNewCommands-cpp", + "version": "wpilib", + "libName": "wpilibNewCommands", + "headerClassifier": "headers", + "sourcesClassifier": "sources", + "sharedLibrary": true, + "skipInvalidPlatforms": true, + "binaryPlatforms": [ + "linuxathena", + "linuxarm32", + "linuxarm64", + "windowsx86-64", + "windowsx86", + "linuxx86-64", + "osxuniversal" + ] + } + ] +} diff --git a/src/main/java/team3647/frc2024/util/RobotTracker.java b/src/main/java/team3647/frc2024/util/RobotTracker.java index bd7620e..3df5397 100644 --- a/src/main/java/team3647/frc2024/util/RobotTracker.java +++ b/src/main/java/team3647/frc2024/util/RobotTracker.java @@ -1,6 +1,7 @@ package team3647.frc2024.util; import edu.wpi.first.math.geometry.Pose2d; +import edu.wpi.first.math.geometry.Rotation2d; import edu.wpi.first.math.geometry.Transform2d; import edu.wpi.first.math.geometry.Twist2d; import edu.wpi.first.math.interpolation.InterpolatingDoubleTreeMap; @@ -92,11 +93,11 @@ public Pose2d compensate(Pose2d pose) { double time = periodicIO.distanceFromSpeaker / shootSpeed; var transform = - new Twist2d( + new Transform2d( periodicIO.speeds.vxMetersPerSecond * time, periodicIO.speeds.vyMetersPerSecond * time, - 0); - var middlePose = periodicIO.pose.exp(transform); + new Rotation2d()); + var middlePose = periodicIO.pose.transformBy(transform); double newDistance = getDistanceFromSpeaker(middlePose); double newSpeed = 15 * (1 - newDistance / 40); double newTime = newDistance / newSpeed; @@ -134,6 +135,10 @@ public double getDistanceFromSpeaker(Pose2d pose) { return pose.transformBy(robotToShooter).minus(speakerPose).getTranslation().getNorm(); } + public double getDistanceFromPose(Pose2d pose){ + return periodicIO.pose.transformBy(robotToShooter).minus(pose).getTranslation().getNorm(); + } + public Pose2d getPose() { return periodicIO.pose; }