Skip to content

Commit

Permalink
Merge pull request #21 from Team612/comp2edits
Browse files Browse the repository at this point in the history
Comp2edits
  • Loading branch information
NotNotTy authored Mar 19, 2024
2 parents 48565f7 + 106d1cc commit 20333d9
Show file tree
Hide file tree
Showing 62 changed files with 2,576 additions and 1,443 deletions.
12 changes: 10 additions & 2 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@
"robotWidth": 0.4723384,
"robotLength": 0.4631436,
"holonomicMode": true,
"pathFolders": [],
"autoFolders": [],
"pathFolders": [
"Left Paths",
"Middle Paths",
"Right Paths"
],
"autoFolders": [
"Left",
"Middle",
"Right"
],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 540.0,
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
},
],
"java.test.defaultConfig": "WPIlibUnitTests",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable"
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx32G -Xms100m -Xlog:disable"
}
175 changes: 175 additions & 0 deletions src/main/deploy/pathplanner/autos/ Four Note Auto.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.2,
"y": 5.55
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Auto Start"
}
},
{
"type": "named",
"data": {
"name": "Intake Down"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Leave Subwoofer"
}
},
{
"type": "named",
"data": {
"name": "Rollers In"
}
}
]
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Intake Up"
}
},
{
"type": "named",
"data": {
"name": "Apriltag Align"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Rollers Out"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Subwoofer-Right"
}
},
{
"type": "named",
"data": {
"name": "Rollers In"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Intake Down"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Intake Up"
}
},
{
"type": "named",
"data": {
"name": "Apriltag Align"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Rollers Out"
}
},
{
"type": "named",
"data": {
"name": "Intake Down"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Subwoofer-Left"
}
},
{
"type": "named",
"data": {
"name": "Rollers In"
}
}
]
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Intake Up"
}
},
{
"type": "named",
"data": {
"name": "Apriltag Align"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Rollers Out"
}
}
]
}
},
"folder": "Middle",
"choreoAuto": false
}
75 changes: 75 additions & 0 deletions src/main/deploy/pathplanner/autos/Left 2 Note Auto.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.6933452953924437,
"y": 6.569779302183426
},
"rotation": 57.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Auto Start"
}
},
{
"type": "named",
"data": {
"name": "Intake Down"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Leave Left"
}
},
{
"type": "named",
"data": {
"name": "Rollers In"
}
}
]
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Left-Subwoofer"
}
},
{
"type": "named",
"data": {
"name": "Intake Up"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Rollers Out"
}
}
]
}
},
"folder": "Left",
"choreoAuto": false
}
18 changes: 18 additions & 0 deletions src/main/deploy/pathplanner/autos/Right Two Note.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2,
"y": 2
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": []
}
},
"folder": "Right",
"choreoAuto": false
}
31 changes: 31 additions & 0 deletions src/main/deploy/pathplanner/autos/ShootLeave.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.6,
"y": 4.5
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Auto Speaker"
}
},
{
"type": "path",
"data": {
"pathName": "Leave Zone Side"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
50 changes: 50 additions & 0 deletions src/main/deploy/pathplanner/autos/ShootPickup.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.1,
"y": 5.55
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Auto Speaker"
}
},
{
"type": "named",
"data": {
"name": "Intake Down"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "ToMiddleNote"
}
},
{
"type": "named",
"data": {
"name": "Rollers In"
}
}
]
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Loading

0 comments on commit 20333d9

Please sign in to comment.