Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
gordonbchen authored Apr 14, 2024
2 parents 86357cb + a61db0a commit f4b0b0f
Show file tree
Hide file tree
Showing 30 changed files with 648 additions and 150 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2024.2.1"
id "edu.wpi.first.GradleRIO" version "2024.3.2"
}

java {
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Amp auto.auto
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{
"type": "path",
"data": {
"pathName": "Amp midline note path"
"pathName": "Amp midline note path 1"
}
},
{
Expand Down Expand Up @@ -80,7 +80,7 @@
{
"type": "path",
"data": {
"pathName": "Amp midline note path"
"pathName": "Amp midline note path 2"
}
},
{
Expand Down
17 changes: 15 additions & 2 deletions src/main/deploy/pathplanner/autos/Center upper 4-note.auto
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,22 @@
"data": {
"commands": [
{
"type": "path",
"type": "sequential",
"data": {
"pathName": "Center note 2"
"commands": [
{
"type": "path",
"data": {
"pathName": "Center note 2"
}
},
{
"type": "wait",
"data": {
"waitTime": 0.5
}
}
]
}
},
{
Expand Down
50 changes: 50 additions & 0 deletions src/main/deploy/pathplanner/autos/Jim auto.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.4662605074140238,
"y": 4.602358762492133
},
"rotation": 180.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "CloseAimShoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Jim"
}
},
{
"type": "named",
"data": {
"name": "SpitNotes"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "KillShooter"
}
}
]
}
},
"folder": "Source",
"choreoAuto": false
}
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Source auto.auto
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"type": "path",
"data": {
"pathName": "Source midline pickup"
"pathName": "Source midline pickup 1"
}
},
{
Expand Down Expand Up @@ -55,7 +55,7 @@
{
"type": "path",
"data": {
"pathName": "Source midline pickup"
"pathName": "Source midline pickup 2"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 3.0,
"x": 3.05,
"y": 6.991369417831561
},
"prevControl": null,
"nextControl": {
"x": 4.299902856581748,
"x": 4.349902856581748,
"y": 7.366116187296568
},
"isLocked": false,
Expand All @@ -32,27 +32,27 @@
},
{
"anchor": {
"x": 8.45,
"x": 8.35,
"y": 7.37782702384235
},
"prevControl": {
"x": 8.45,
"x": 8.35,
"y": 7.42782702384235
},
"nextControl": {
"x": 8.45,
"x": 8.35,
"y": 6.891238484474708
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 8.45,
"x": 8.35,
"y": 3.1385041942694443
},
"prevControl": {
"x": 8.45,
"x": 8.35,
"y": 3.7623672132546333
},
"nextControl": null,
Expand Down
91 changes: 91 additions & 0 deletions src/main/deploy/pathplanner/paths/Amp midline note path 2.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 3.05,
"y": 6.991369417831561
},
"prevControl": null,
"nextControl": {
"x": 5.822691702444745,
"y": 6.628333484912334
},
"isLocked": false,
"linkedName": "Amp shooting"
},
{
"anchor": {
"x": 8.35,
"y": 5.796864090161846
},
"prevControl": {
"x": 8.35,
"y": 5.846864090161846
},
"nextControl": {
"x": 8.35,
"y": 5.310275550794204
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 8.35,
"y": 3.1385041942694443
},
"prevControl": {
"x": 8.35,
"y": 3.7623672132546333
},
"nextControl": null,
"isLocked": false,
"linkedName": "Amp midline pickup end"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.7,
"rotationDegrees": 159.4149015548405,
"rotateFast": false
},
{
"waypointRelativePos": 1.9499999999999997,
"rotationDegrees": 180.0,
"rotateFast": false
}
],
"constraintZones": [
{
"name": "New Constraints Zone",
"minWaypointRelativePos": 0.8,
"maxWaypointRelativePos": 1.8499999999999996,
"constraints": {
"maxVelocity": 1.5,
"maxAcceleration": 5.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 720.0
}
}
],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.0,
"maxAcceleration": 4.0,
"maxAngularVelocity": 360.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 180.0,
"rotateFast": false
},
"reversed": false,
"folder": "Amp",
"previewStartingState": {
"rotation": -152.74467162505698,
"velocity": 0
},
"useDefaultConstraints": true
}
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Amp note 2.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
{
"anchor": {
"x": 3.0,
"x": 3.05,
"y": 6.991369417831561
},
"prevControl": {
"x": 2.027365849063134,
"x": 2.077365849063134,
"y": 6.991369417831561
},
"nextControl": null,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/Amp return path.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"waypoints": [
{
"anchor": {
"x": 8.45,
"x": 8.35,
"y": 3.1385041942694443
},
"prevControl": null,
"nextControl": {
"x": 7.506811289942122,
"x": 7.406811289942122,
"y": 6.2770083885388885
},
"isLocked": false,
"linkedName": "Amp midline pickup end"
},
{
"anchor": {
"x": 3.0,
"x": 3.05,
"y": 6.991369417831561
},
"prevControl": {
"x": 5.424143164976773,
"x": 5.4741431649767724,
"y": 6.90939356201109
},
"nextControl": null,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Center lower note.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 3.480524393288442,
"y": 5.539225686154654
"x": 3.05,
"y": 5.54
},
"prevControl": null,
"nextControl": {
"x": 5.283993221338795,
"y": 4.251033666118688
"x": 4.853468828050353,
"y": 4.251807979964034
},
"isLocked": false,
"linkedName": "Center shooting"
Expand All @@ -32,12 +32,12 @@
},
{
"anchor": {
"x": 3.480524393288442,
"y": 5.539225686154654
"x": 3.05,
"y": 5.54
},
"prevControl": {
"x": 5.061487326968947,
"y": 4.27445533921025
"x": 4.630962933680504,
"y": 4.275229653055596
},
"nextControl": null,
"isLocked": false,
Expand Down
Loading

0 comments on commit f4b0b0f

Please sign in to comment.