Skip to content
This repository has been archived by the owner on May 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #36 from Gongoliers/4_3_2024_dcmp
Browse files Browse the repository at this point in the history
4 3 2024 dcmp
  • Loading branch information
haydenheroux authored Apr 7, 2024
2 parents b9c8345 + 659388b commit 36dafa5
Show file tree
Hide file tree
Showing 49 changed files with 999 additions and 384 deletions.
2 changes: 1 addition & 1 deletion simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
0.0,
0.8500000238418579
],
"height": 338,
"height": 0,
"series": [
{
"color": [
Expand Down
44 changes: 44 additions & 0 deletions src/main/deploy/pathplanner/autos/!everything black 2.0.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.7636103146671326,
"y": 4.403274541213847
},
"rotation": -60.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "stage.sweep2"
}
},
{
"type": "named",
"data": {
"name": "stow"
}
}
]
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 4.39
"x": 0.8,
"y": 6.63
},
"rotation": -60.0
"rotation": 60.0
},
"command": {
"type": "sequential",
Expand All @@ -14,57 +14,51 @@
{
"type": "named",
"data": {
"name": "home"
"name": "shoot"
}
},
{
"type": "named",
"data": {
"name": "readyShoot"
"name": "intake"
}
},
{
"type": "named",
"type": "path",
"data": {
"name": "shootNote"
"pathName": "amp.toNearest"
}
},
{
"type": "path",
"data": {
"pathName": "stage.toNearest"
"pathName": "amp.toSubwoofer"
}
},
{
"type": "race",
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "intakeNote"
"name": "intake"
}
},
{
"type": "wait",
"type": "path",
"data": {
"waitTime": 2.0
"pathName": "amp.race"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "stage.toSubwoofer"
}
},
{
"type": "named",
"data": {
"name": "shootNote"
}
}
]
}
Expand Down
61 changes: 61 additions & 0 deletions src/main/deploy/pathplanner/autos/amp.shootIntakeShootLeave.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.8,
"y": 6.63
},
"rotation": 60.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "named",
"data": {
"name": "intake"
}
},
{
"type": "path",
"data": {
"pathName": "amp.toNearest"
}
},
{
"type": "path",
"data": {
"pathName": "amp.toSubwoofer"
}
},
{
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "named",
"data": {
"name": "stow"
}
},
{
"type": "path",
"data": {
"pathName": "amp.leave"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
21 changes: 4 additions & 17 deletions src/main/deploy/pathplanner/autos/amp.shootLeave.auto
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,15 @@
"data": {
"commands": [
{
"type": "named",
"type": "wait",
"data": {
"name": "home"
"waitTime": 2.0
}
},
{
"type": "deadline",
"type": "named",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 3.0
}
},
{
"type": "named",
"data": {
"name": "shootNote"
}
}
]
"name": "shoot"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"data": {
"commands": [
{
"type": "named",
"type": "wait",
"data": {
"name": "home"
"waitTime": 2.0
}
},
{
"type": "named",
"data": {
"name": "shootNote"
"name": "shoot"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,28 @@
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 2.0
}
},
{
"type": "named",
"data": {
"name": "home"
"name": "shoot"
}
},
{
"type": "named",
"data": {
"name": "stow"
}
},
{
"type": "wait",
"data": {
"waitTime": 8.0
}
},
{
Expand Down
101 changes: 101 additions & 0 deletions src/main/deploy/pathplanner/autos/center.3.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.3633965729469937,
"y": 5.555088802485298
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "intake"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "center.toNearest"
}
},
{
"type": "path",
"data": {
"pathName": "center.toSubwoofer"
}
}
]
}
}
]
}
},
{
"type": "named",
"data": {
"name": "shoot"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "intake"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "center.toStage"
}
},
{
"type": "path",
"data": {
"pathName": "center.stageToSub"
}
}
]
}
}
]
}
},
{
"type": "named",
"data": {
"name": "shoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Loading

0 comments on commit 36dafa5

Please sign in to comment.