Skip to content

Commit

Permalink
Merge pull request #53 from StuyPulse/pre-brunswick (actually brunswi…
Browse files Browse the repository at this point in the history
…ck changes although we never branched for brunswick)

Brunswick
  • Loading branch information
IanShiii authored Oct 28, 2024
2 parents 8e04ba4 + 0df0bdb commit 381679b
Show file tree
Hide file tree
Showing 80 changed files with 1,211 additions and 483 deletions.
Binary file added logs/FRC_20241026_155719_NJNor_Q20.wpilog
Binary file not shown.
Binary file added logs/FRC_20241026_164928_NJNor_Q26.wpilog
Binary file not shown.
Binary file added logs/FRC_20241026_195838_NJNor_E3.wpilog
Binary file not shown.
Binary file removed logs/FRC_TBD_0b09622a29ea64b8.wpilog
Binary file not shown.
Binary file added logs/FRC_TBD_5a8780ec987488e1.wpilog
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Blue 90 Deg BCA.auto
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
}
},
"resetOdom": true,
"folder": "Blue Autons",
"folder": "Blue Useable",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
}
},
"resetOdom": true,
"folder": "Blue Autons",
"folder": "Blue Useable",
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue DEF.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Amp to D"
}
},
{
"type": "path",
"data": {
"pathName": "Blue D to Shoot Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Blue D Shoot to E Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Blue E to Shoot Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Blue E Shoot to F Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Blue F to Shoot"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Useable",
"choreoAuto": false
}
10 changes: 8 additions & 2 deletions src/main/deploy/pathplanner/autos/Blue GH.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8795509328910394,
"y": 4.209895599278378
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -31,7 +38,6 @@
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"folder": null,
"choreoAuto": false
}
12 changes: 9 additions & 3 deletions src/main/deploy/pathplanner/autos/Blue HG.auto
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2,
"y": 2
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
Expand All @@ -25,13 +32,12 @@
{
"type": "path",
"data": {
"pathName": "Red G to Shoot"
"pathName": "Blue G to Shoot"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"folder": null,
"choreoAuto": false
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8795509328910394,
"y": 4.209895599278378
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Blue Autons",
"folder": null,
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Red 90 Deg BCA.auto
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
}
},
"resetOdom": true,
"folder": "Red Autons",
"folder": "Red Useable",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
}
},
"resetOdom": true,
"folder": "Red Autons",
"folder": "Red Useable",
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Red GH.auto
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
}
},
"resetOdom": true,
"folder": "Red Autons",
"folder": "Red Useable",
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/Red HG.auto
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
}
},
"resetOdom": true,
"folder": "Red Autons",
"folder": "Red Useable",
"choreoAuto": false
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.88,
"y": 4.21
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
Expand Down Expand Up @@ -43,7 +50,6 @@
]
}
},
"resetOdom": true,
"folder": "Red Autons",
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/Red Midline Shots.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Red Amp to D"
}
},
{
"type": "path",
"data": {
"pathName": "Red D to Shoot Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Red D Shoot to E Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Red E to Shoot Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Red E Shoot to F Alt"
}
},
{
"type": "path",
"data": {
"pathName": "Red F to Shoot"
}
}
]
}
},
"resetOdom": true,
"folder": "Red Useable",
"choreoAuto": false
}
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue Amp Side Mobility.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.702311404622812,
"y": 6.739121939782341
"x": 1.6299951070884284,
"y": 7.598758525270028
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 2.496814123442796,
"y": 7.4598028796628215
"x": 3.7613533644105983,
"y": 7.467083995737933
},
"prevControl": {
"x": 1.496814123442796,
"y": 7.4598028796628215
"x": 2.7613533644105983,
"y": 7.467083995737933
},
"nextControl": null,
"isLocked": false,
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/Blue Amp to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.3901542060896621,
"y": 6.569495408336055
"x": 0.771923300729042,
"y": 6.761454662232242
},
"prevControl": null,
"nextControl": {
"x": 1.8598514847351095,
"y": 6.746049877940562
"x": 1.2416205793744894,
"y": 6.93800913183675
},
"isLocked": false,
"linkedName": "Blue ADEF Starting Pose"
Expand Down Expand Up @@ -46,7 +46,7 @@
"folder": "Blue To Note",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
"rotation": 61.21333556498881
},
"useDefaultConstraints": false
}
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/paths/Blue Amp to D.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 0.771923300729042,
"y": 6.761454662232242
},
"prevControl": null,
"nextControl": {
"x": 1.35957917842175,
"y": 8.561439231323403
},
"isLocked": false,
"linkedName": "Blue ADEF Starting Pose"
},
{
"anchor": {
"x": 8.303868098476938,
"y": 7.429163844438801
},
"prevControl": {
"x": 6.354990656409885,
"y": 7.0765312838289365
},
"nextControl": null,
"isLocked": false,
"linkedName": "Blue D"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.35,
"rotationDegrees": 90.07372067708508,
"rotateFast": false
}
],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0,
"rotateFast": false
},
"reversed": false,
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": true
}
Loading

0 comments on commit 381679b

Please sign in to comment.