Skip to content
This repository has been archived by the owner on Jan 4, 2025. It is now read-only.

Commit

Permalink
Merge branch 'main' into interpolated-vision
Browse files Browse the repository at this point in the history
  • Loading branch information
@Owen756
Owen756 committed Jul 11, 2024
2 parents dfbb528 + 98cd02b commit d0f8078
Show file tree
Hide file tree
Showing 79 changed files with 19,454 additions and 2,668 deletions.
5 changes: 3 additions & 2 deletions .pathplanner/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
],
"autoFolders": [
"Blue Dynamic Autos in Development",
"Red dynamic autos",
"Blue dynamic autos",
"Red Choreo Autos",
"Red Dynamic Autos in Development",
"Blue dynamic autos"
"Red dynamic autos"
],
"defaultMaxVel": 5.2,
"defaultMaxAccel": 5.0,
Expand Down
6,398 changes: 5,456 additions & 942 deletions Choreo_Trajectories.chor
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Team 581's FRC 2024 Crescendo gamma robot code
# Team 581's FRC 2024 Crescendo offseason gamma robot code

[![CI](https://github.com/team581/frc-2024-crescendo-gamma/actions/workflows/ci.yml/badge.svg)](https://github.com/team581/frc-2024-crescendo-gamma/actions/workflows/ci.yml)
[![CI](https://github.com/team581/offseason-2024-gamma/actions/workflows/ci.yml/badge.svg)](https://github.com/team581/offseason-2024-gamma/actions/workflows/ci.yml)

[Team 581](https://github.com/team581)'s in-season robot code for our gamma/competition bot for the FRC 2024 Crescendo game.
[Team 581](https://github.com/team581)'s offseason robot code for our gamma/competition bot for the FRC 2024 Crescendo game.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
id "com.peterabeles.gversion" version "1.10.2"
id "com.peterabeles.gversion" version "1.10.3"
id "com.diffplug.spotless" version "6.25.0"
}

Expand Down Expand Up @@ -72,7 +72,7 @@ dependencies {
nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop)
simulationRelease wpi.sim.enableRelease()

testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# 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
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
140 changes: 140 additions & 0 deletions src/main/deploy/choreo/Red 4 to 5.1 2.traj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"samples": [
{
"x": 9.111647605895996,
"y": 7.470791816711426,
"heading": -1.05718871216561e-30,
"angularVelocity": 3.118504998701382e-31,
"velocityX": 6.039100561599308e-21,
"velocityY": 1.8009343842569663e-19,
"timestamp": 0
},
{
"x": 9.143340108113769,
"y": 7.446687839925814,
"heading": -1.1700310711180642e-18,
"angularVelocity": -1.8565347315473353e-17,
"velocityX": 0.5028775532448245,
"velocityY": -0.3824673983179698,
"timestamp": 0.06302230436271758
},
{
"x": 9.20468145119787,
"y": 7.396006382726051,
"heading": 1.8056475843181295e-18,
"angularVelocity": 4.721627840095709e-17,
"velocityX": 0.9733275180014863,
"velocityY": -0.8041828636983419,
"timestamp": 0.12604460872543516
},
{
"x": 9.29159191314905,
"y": 7.314802210827562,
"heading": 6.5446419450669345e-18,
"angularVelocity": 7.519550919609085e-17,
"velocityX": 1.3790429091743241,
"velocityY": -1.2884989325681133,
"timestamp": 0.18906691308815274
},
{
"x": 9.394024992378341,
"y": 7.196931108324088,
"heading": 1.0466872659140665e-17,
"angularVelocity": 6.223559712325196e-17,
"velocityX": 1.6253464589248696,
"velocityY": -1.8703077219217359,
"timestamp": 0.2520892174508703
},
{
"x": 9.486406073668979,
"y": 7.040532454821936,
"heading": 9.387684387047981e-18,
"angularVelocity": -1.7123910513967864e-17,
"velocityX": 1.465847404737292,
"velocityY": -2.4816397160349983,
"timestamp": 0.3151115218135879
},
{
"x": 9.544986688827217,
"y": 6.8630875726594285,
"heading": 8.793699397125095e-18,
"angularVelocity": -9.424997001991433e-18,
"velocityX": 0.929521948627871,
"velocityY": -2.815588607181346,
"timestamp": 0.37813382617630553
},
{
"x": 9.564400672912598,
"y": 6.678473949432373,
"heading": 6.026195272855988e-18,
"angularVelocity": -4.391308904044169e-17,
"velocityX": 0.3080494164990886,
"velocityY": -2.9293378763945945,
"timestamp": 0.44115613053902314
},
{
"x": 9.533920060898456,
"y": 6.465337858341574,
"heading": 3.2791995300552913e-18,
"angularVelocity": -3.783392353465437e-17,
"velocityX": -0.41980447713101565,
"velocityY": -2.9354884749825843,
"timestamp": 0.5137628169242787
},
{
"x": 9.451829657549295,
"y": 6.26357893370136,
"heading": 6.745548569249782e-18,
"angularVelocity": 4.7741455890632045e-17,
"velocityX": -1.130617680491636,
"velocityY": -2.778792624830332,
"timestamp": 0.5863695033095343
},
{
"x": 9.332723735038355,
"y": 6.099540834625063,
"heading": 4.720380341741389e-18,
"angularVelocity": -2.7892309176467646e-17,
"velocityX": -1.640426363475722,
"velocityY": -2.2592698722790585,
"timestamp": 0.6589761896947899
},
{
"x": 9.221886486725465,
"y": 5.987700806646064,
"heading": -2.9444142095504363e-18,
"angularVelocity": -1.0556595929632475e-16,
"velocityX": -1.5265432679955857,
"velocityY": -1.5403543880980908,
"timestamp": 0.7315828760800455
},
{
"x": 9.14193306171042,
"y": 5.918746675175855,
"heading": -1.587123146449334e-18,
"angularVelocity": 1.8693746948193755e-17,
"velocityX": -1.1011854278925208,
"velocityY": -0.9496939593725585,
"timestamp": 0.804189562465301
},
{
"x": 9.100329399108888,
"y": 5.88615608215332,
"heading": 2.2037577276388683e-30,
"angularVelocity": 2.185918820959246e-17,
"velocityX": -0.5730004311286885,
"velocityY": -0.44886489998548856,
"timestamp": 0.8767962488505566
},
{
"x": 9.100329399108888,
"y": 5.88615608215332,
"heading": 1.055345960195893e-30,
"angularVelocity": -1.2817805459557936e-30,
"velocityX": -1.5709732296828935e-20,
"velocityY": 3.1336350844643724e-19,
"timestamp": 0.9494029352358122
}
],
"eventMarkers": []
}
177 changes: 177 additions & 0 deletions src/main/deploy/choreo/Red 4 to 5.1.traj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
{
"samples": [
{
"x": 9.570359230041504,
"y": 7.533205986022949,
"heading": 2.837553697468469e-27,
"angularVelocity": 1.2858073985093775e-27,
"velocityX": 3.929456586583098e-19,
"velocityY": 1.3369892836254632e-18,
"timestamp": 0
},
{
"x": 9.578782459095901,
"y": 7.491411310315301,
"heading": 4.923887190188839e-18,
"angularVelocity": 7.550337998258628e-17,
"velocityX": 0.12916263916652715,
"velocityY": -0.6408837492897412,
"timestamp": 0.06521412932371412
},
{
"x": 9.593047663479659,
"y": 7.407383744923941,
"heading": 8.7575474267071e-18,
"angularVelocity": 5.878573045312757e-17,
"velocityX": 0.21874407481462338,
"velocityY": -1.2884871156411322,
"timestamp": 0.13042825864742824
},
{
"x": 9.609050762578377,
"y": 7.280756587054724,
"heading": 1.5830775069210892e-17,
"angularVelocity": 1.0846158204666518e-16,
"velocityX": 0.24539312668395535,
"velocityY": -1.9417135394180687,
"timestamp": 0.19564238797114236
},
{
"x": 9.619581483588787,
"y": 7.111847063024372,
"heading": 1.351977297182082e-17,
"angularVelocity": -3.543713803053726e-17,
"velocityX": 0.16147913220059756,
"velocityY": -2.5900755830367284,
"timestamp": 0.2608565172948565
},
{
"x": 9.610988346334986,
"y": 6.904832116628309,
"heading": 1.1213563371751803e-17,
"angularVelocity": -3.536364929500549e-17,
"velocityX": -0.131768028537904,
"velocityY": -3.174387951550641,
"timestamp": 0.3260706466185706
},
{
"x": 9.564400672912598,
"y": 6.678473949432373,
"heading": -3.0718939053161175e-18,
"angularVelocity": -2.1905463476658995e-16,
"velocityX": -0.7143800569832521,
"velocityY": -3.4709988394129123,
"timestamp": 0.3912847759422847
},
{
"x": 9.486888499519376,
"y": 6.477915488845292,
"heading": -2.382566973004584e-17,
"angularVelocity": -3.487118187109928e-16,
"velocityX": -1.3023852218818446,
"velocityY": -3.3698497120818054,
"timestamp": 0.4508003264037865
},
{
"x": 9.388684393644013,
"y": 6.306214692673101,
"heading": -2.812446729719055e-17,
"angularVelocity": -7.22298214874531e-17,
"velocityX": -1.6500579279508787,
"velocityY": -2.8849736722717,
"timestamp": 0.5103158768652882
},
{
"x": 9.305060350101293,
"y": 6.166892021614753,
"heading": -2.368886627734559e-17,
"angularVelocity": 7.452843840961614e-17,
"velocityX": -1.4050788893704838,
"velocityY": -2.3409456852536437,
"timestamp": 0.5698314273267899
},
{
"x": 9.246133814938752,
"y": 6.053083162641967,
"heading": -1.5812896843887468e-17,
"angularVelocity": 1.3233464831351022e-16,
"velocityX": -0.990103169770027,
"velocityY": -1.9122541603039365,
"timestamp": 0.6293469777882916
},
{
"x": 9.21502434791928,
"y": 5.961345379431105,
"heading": -1.0280341318353077e-17,
"angularVelocity": 9.295983120434094e-17,
"velocityX": -0.5227115733323473,
"velocityY": -1.5414086318533518,
"timestamp": 0.6888625282497933
},
{
"x": 9.213134765625,
"y": 5.889784812927246,
"heading": -5.475042515337732e-27,
"angularVelocity": 1.727337015993494e-16,
"velocityX": -0.03174938784280189,
"velocityY": -1.2023843507949883,
"timestamp": 0.748378078711295
},
{
"x": 9.279972650601232,
"y": 5.82484633107135,
"heading": 1.650291714944183e-17,
"angularVelocity": 1.818917451335665e-16,
"velocityX": 0.7366733685548789,
"velocityY": -0.7157385395219245,
"timestamp": 0.8391074138946035
},
{
"x": 9.414002802389295,
"y": 5.807817742851688,
"heading": 4.3811469472123005e-17,
"angularVelocity": 3.009892258719419e-16,
"velocityX": 1.4772526605344272,
"velocityY": -0.1876855835574857,
"timestamp": 0.929836749077912
},
{
"x": 9.566226598810443,
"y": 5.87128228242156,
"heading": 1.3002245043408661e-17,
"angularVelocity": -3.395729106505042e-16,
"velocityX": 1.6777792553378463,
"velocityY": 0.6994930519621869,
"timestamp": 1.0205660842612205
},
{
"x": 9.641109466552734,
"y": 5.9059624671936035,
"heading": 5.3076276692349445e-27,
"angularVelocity": -1.4330806011987793e-16,
"velocityX": 0.8253435075987224,
"velocityY": 0.38223783632907515,
"timestamp": 1.111295419444529
},
{
"x": 9.641109466552734,
"y": 5.9059624671936035,
"heading": 2.6375377363273866e-27,
"angularVelocity": -3.5878359006669536e-28,
"velocityX": -7.830786140194078e-19,
"velocityY": -5.392178903208723e-18,
"timestamp": 1.2020247546278375
}
],
"eventMarkers": [
{
"timestamp": 0.3912847759422847,
"command": {
"type": "named",
"data": {
"name": "intakeFloor"
}
}
}
]
}
Loading

0 comments on commit d0f8078

Please sign in to comment.