Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move some common fields constants to Field.java #139

Closed
wants to merge 12 commits into from
Closed

Move some common fields constants to Field.java #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
00f426f
Move field constants to fields
Krylez Mar 12, 2024
f6cda29
Merge branch 'main' into fields
Krylez Mar 13, 2024
f821c91
Move zero angle to fields class
Krylez Mar 13, 2024
beb5ea1
Merge branch 'main' into fields
Krylez Mar 13, 2024
8a148f4
Stop logging protos
Krylez Mar 16, 2024
3a6ade5
Maybe fix shoot and leave source
Krylez Mar 16, 2024
78ca3d5
More Autos
Krylez Mar 17, 2024
f45b6f4
Move collect into collect paths
Krylez Mar 17, 2024
8a686f4
rename
Krylez Mar 17, 2024
aa69130
Add quick firing for autos
Krylez Mar 17, 2024
bda9672
Merge branch 'main' into fields
Krylez Mar 17, 2024
c4e2df1
Merge branch 'bonney-lake' into fields
Krylez Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...loy/pathplanner/autos/HopesAndDreams.auto → ...y/pathplanner/autos/HOPES_AND_DREAMS.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
"pathName": "ScoreSpeakerPositionFront"
}
},
{
"type": "named",
"data": {
"name": "SHOOT_SUB"
}
},
{
"type": "path",
"data": {
Expand All @@ -35,6 +41,12 @@
"pathName": "ScoreSpeakerPositionFront"
}
},
{
"type": "named",
"data": {
"name": "SHOOT_SUB"
}
},
{
"type": "path",
"data": {
Expand All @@ -47,6 +59,12 @@
"pathName": "ScoreSpeakerPositionFront"
}
},
{
"type": "named",
"data": {
"name": "SHOOT_SUB"
}
},
{
"type": "path",
"data": {
Expand Down
31 changes: 31 additions & 0 deletions src/main/deploy/pathplanner/autos/Lol.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 2,
"y": 2
},
"rotation": 0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Lol-Ready"
}
},
{
"type": "path",
"data": {
"pathName": "Lol-Go"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
12 changes: 3 additions & 9 deletions src/main/deploy/pathplanner/autos/SHOOT_AND_LEAVE_SOURCE.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.65,
"y": 4.5
"x": 0.63,
"y": 6.63
},
"rotation": 120.0
"rotation": 100.0
},
"command": {
"type": "sequential",
Expand All @@ -17,12 +17,6 @@
"name": "SHOOT_SUB"
}
},
{
"type": "wait",
"data": {
"waitTime": 2.0
}
},
{
"type": "path",
"data": {
Expand Down
18 changes: 15 additions & 3 deletions src/main/deploy/pathplanner/autos/SHOOT_AND_LEAVE_SOURCE_COLLECT.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,27 @@
}
},
{
"type": "wait",
"type": "path",
"data": {
"waitTime": 2.0
"pathName": "LeaveSubRightCollectCenterLineBottom"
}
},
{
"type": "path",
"data": {
"pathName": "LeaveSubRightCollectCenterLineBottom"
"pathName": "Score Source Side"
}
},
{
"type": "named",
"data": {
"name": "SHOOT_SUB"
}
},
{
"type": "path",
"data": {
"pathName": "Yoink Note 2"
}
}
]
Expand Down
37 changes: 37 additions & 0 deletions src/main/deploy/pathplanner/autos/SHOOT_WAIT_AND_LEAVE_AMP.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.63,
"y": 6.63
},
"rotation": -120.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "SHOOT_SUB"
}
},
{
"type": "wait",
"data": {
"waitTime": 8.0
}
},
{
"type": "path",
"data": {
"pathName": "LeaveSubLeft"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
36 changes: 27 additions & 9 deletions src/main/deploy/pathplanner/paths/CollectCenterLineTop.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 3.42181301812268,
"y": 6.687270824206078
"x": 5.405267186373299,
"y": 7.196908353548251
},
"prevControl": null,
"nextControl": {
"x": 5.0471435171058205,
"y": 6.825010697001261
"x": 6.142175505827522,
"y": 7.313987245424156
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 7.822601953928739,
"y": 7.417292150020542
"x": 7.8845848966865715,
"y": 7.403518162741023
},
"prevControl": {
"x": 6.810213888884153,
"y": 7.375970188181988
"x": 6.872196831641985,
"y": 7.362196200902469
},
"nextControl": null,
"isLocked": false,
Expand All @@ -30,7 +30,25 @@
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"eventMarkers": [
{
"name": "COLLECT",
"waypointRelativePos": 0.45,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "COLLECT"
}
}
]
}
}
}
],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
Expand Down
28 changes: 23 additions & 5 deletions src/main/deploy/pathplanner/paths/CollectLeft.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 2.2647980866431525,
"y": 6.1845202885036645
"x": 1.9617703664937525,
"y": 5.895266555633783
},
"prevControl": null,
"nextControl": {
"x": 2.567825806792553,
"y": 6.4531130404542685
"x": 2.264798086643152,
"y": 6.163859307584387
},
"isLocked": false,
"linkedName": null
Expand All @@ -30,7 +30,25 @@
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"eventMarkers": [
{
"name": "COLLECT",
"waypointRelativePos": 0,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "COLLECT"
}
}
]
}
}
}
],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
Expand Down
24 changes: 21 additions & 3 deletions src/main/deploy/pathplanner/paths/CollectMiddle.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 2.0444142901708617,
"x": 1.541663754468448,
"y": 5.571577854565105
},
"prevControl": null,
"nextControl": {
"x": 2.2678904149754606,
"x": 1.765139879273046,
"y": 5.5274414307217885
},
"isLocked": false,
Expand All @@ -30,7 +30,25 @@
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"eventMarkers": [
{
"name": "COLLECT",
"waypointRelativePos": 0.2,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "COLLECT"
}
}
]
}
}
}
],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/CollectRight.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 1.693177614543148,
"y": 4.910426465148232
"x": 1.713838595462425,
"y": 5.048166337943415
},
"prevControl": null,
"nextControl": {
"x": 1.9097667457079872,
"y": 4.707889187590455
"x": 1.930427726627264,
"y": 4.845629060385638
},
"isLocked": false,
"linkedName": null
Expand All @@ -33,7 +33,7 @@
"eventMarkers": [
{
"name": "COLLECT",
"waypointRelativePos": 0,
"waypointRelativePos": 0.0,
"command": {
"type": "parallel",
"data": {
Expand Down
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/LeaveSubLeft.path
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 0.6325805940202477,
"y": 6.625287881448246
},
"prevControl": null,
"nextControl": {
"x": 0.4976965624321599,
"y": 7.3902532375505094
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 7.264755469108254,
"y": 7.3828571818217466
},
"prevControl": {
"x": 3.0499153615756893,
"y": 7.004072531634997
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 179.4153694792949,
"rotateFast": false
},
"reversed": false,
"folder": null,
"previewStartingState": {
"rotation": -119.35775354279127,
"velocity": 0
},
"useDefaultConstraints": true
}
Loading