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.

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

New Top Ferry Auton #104

Merged
merged 43 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7d1746d
added HGFED Ferry auton
BrianZ60 Mar 9, 2024
9f214a1
FERRY PATHS AUTON FERRY PATHS
Cancelable Mar 11, 2024
c6cb538
Actually finished ferry autons
Cancelable Mar 11, 2024
6023b25
Add CHGFEDJerk.java
Keobkeig Mar 22, 2024
c9bb0a9
move to ferry folder
Keobkeig Mar 22, 2024
d93d90e
CHGFEDJerk working in sim
Keobkeig Mar 22, 2024
67a74ea
Merge branch 'main' of https://github.com/StuyPulse/Izzi into se/ferr…
Keobkeig Mar 25, 2024
f57b9a6
Edit ferry path auton to not shoot every shot
Keobkeig Mar 25, 2024
0af71ea
Remove uppercase To
BenG49 Mar 26, 2024
701cf36
Delete unused new path
BenG49 Mar 26, 2024
3b7a76d
Rename paths in robot container
BenG49 Mar 26, 2024
aea0e20
Merge branch 'main' of github.com:StuyPulse/BigWang into se/ferry-autons
BenG49 Mar 26, 2024
5eb111c
Merge branch 'main' of github.com:StuyPulse/BigWang into se/ferry-autons
BenG49 Mar 26, 2024
d06fb14
Revert CShoot to H path
BenG49 Mar 26, 2024
488ceb7
Jerk and Ferry path fixed
Keobkeig Mar 26, 2024
f6ab39d
revert intake to blue
Keobkeig Mar 28, 2024
0cd1b5a
update jerk name (doesnt score C)
Keobkeig Mar 28, 2024
4daf6c1
Merge branch 'main' of https://github.com/StuyPulse/Izzi into se/ferr…
Keobkeig Mar 28, 2024
edfb5f2
Made F to Ferry Shot not hit stage
Keobkeig Mar 28, 2024
51e738e
wrote bottom ferry auton (not sure where its shooting)
Keobkeig Mar 28, 2024
fc55210
intake is solid now
Keobkeig Mar 28, 2024
fe17f2e
BottomFerry now aligns to amp zone
Keobkeig Mar 28, 2024
b627f9b
revert intake color change
Keobkeig Apr 3, 2024
2356777
Merge branch 'main' of github.com:StuyPulse/BigWang into se/ferry-autons
BenG49 Apr 3, 2024
a4c5d65
Remove navgrid
BenG49 Apr 3, 2024
afa056c
Merge branch 'main' of https://github.com/StuyPulse/Izzi into se/ferr…
Keobkeig Apr 8, 2024
e575b26
add paths to prep for TopFerry
alex-wanger Apr 8, 2024
dbd2a30
Moved ferry shot positions closer to wing line; added a new path for …
hahafoot Apr 9, 2024
dee4732
TopFerry
Keobkeig Apr 9, 2024
937390f
adding the shoot to alignment
Keobkeig Apr 9, 2024
bde78f8
Merge branch 'main' of github.com:StuyPulse/BigWang into se/ferry-autons
BenG49 Apr 9, 2024
e9e6a00
Clean up + organize paths
BenG49 Apr 9, 2024
4646423
Add new top ferry auton paths
anivanchen Apr 9, 2024
a477d68
Change starting pose of NTF, change path folders
BenG49 Apr 9, 2024
7003972
Write Top Ferry auton
BenG49 Apr 9, 2024
8d8a402
Rename top ferry auton for merge
BenG49 Apr 9, 2024
fab436c
Make robot not stop to shoot
BenG49 Apr 9, 2024
f20e820
Delete a ton of stuff, remove everything but top ferry autos from thi…
BenG49 Apr 9, 2024
b6161c5
Remove auton configs
BenG49 Apr 9, 2024
3d8d3a0
Remove autos, fix F to Shoot, separate non-moving and moving shot fer…
BenG49 Apr 9, 2024
867823e
Revert linked F pose
BenG49 Apr 9, 2024
dc23444
Delete amp zone align command
Apr 9, 2024
9595866
Lower shooter speeds
BenG49 Apr 9, 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
3 changes: 2 additions & 1 deletion .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"pathFolders": [
"ABCDE",
"HGF",
"Tests"
"Tests",
"Top Ferry"
],
"autoFolders": [],
"defaultMaxVel": 4.5,
Expand Down
55 changes: 0 additions & 55 deletions src/main/deploy/pathplanner/autos/4.5 ADEF.auto

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,37 @@
{
"type": "path",
"data": {
"pathName": "Preload to A"
"pathName": "NTF Start To D"
}
},
{
"type": "path",
"data": {
"pathName": "A to D"
"pathName": "D to Ferry Shot"
}
},
{
"type": "path",
"data": {
"pathName": "D to Ferry Shot"
"pathName": "Ferry Shot to E"
}
},
{
"type": "path",
"data": {
"pathName": "Ferry Shot to E"
"pathName": "E to Ferry Shot"
}
},
{
"type": "path",
"data": {
"pathName": "Ferry Shot to F"
}
},
{
"type": "path",
"data": {
"pathName": "E to Shoot"
"pathName": "F to Shoot (TopFerry)"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
{
"version": 1.0,
"startingPose": null,
"startingPose": {
"position": {
"x": 2.157525588199325,
"y": 7.431149973519566
},
"rotation": 40.419189934887385
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Preload Shot to D"
"pathName": "NTF Start To D"
}
},
{
"type": "path",
"data": {
"pathName": "D to Ferry Shot"
"pathName": "NTF D To E"
}
},
{
"type": "path",
"data": {
"pathName": "Ferry Shot to E"
"pathName": "NTF E To F"
}
},
{
"type": "path",
"data": {
"pathName": "E to Shoot"
"pathName": "NTF F To Shoot"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/navgrid.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/D to Ferry Shot.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
{
"anchor": {
"x": 5.135414608792181,
"y": 6.653128792368697
"x": 5.499492913428859,
"y": 6.563657142562062
},
"prevControl": {
"x": 5.5734337811268215,
"y": 6.740245674935794
"x": 5.937512085763499,
"y": 6.650774025129159
},
"nextControl": null,
"isLocked": false,
Expand All @@ -43,7 +43,7 @@
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
Expand Down
52 changes: 52 additions & 0 deletions src/main/deploy/pathplanner/paths/E to Ferry Shot.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 8.17,
"y": 5.84
},
"prevControl": null,
"nextControl": {
"x": 7.901123246690937,
"y": 5.852924298441191
},
"isLocked": false,
"linkedName": "E"
},
{
"anchor": {
"x": 5.499492913428859,
"y": 6.563657142562062
},
"prevControl": {
"x": 5.767026853498151,
"y": 6.480854711709423
},
"nextControl": null,
"isLocked": false,
"linkedName": "Ferry Shot"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.0,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": -4.860211087167981,
"rotateFast": false
},
"reversed": false,
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/F to Shoot (HGF).path
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"prevControl": null,
"nextControl": {
"x": 4.984199142187458,
"y": 5.4377818157345725
"y": 5.437781815734572
},
"isLocked": false,
"linkedName": "F"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.729397148609112,
"y": 6.342607879660204
"x": 8.098576303634088,
"y": 4.038315859039126
},
"prevControl": null,
"nextControl": {
"x": 6.23533205862708,
"y": 6.780508283238789
"x": 5.1332173868051445,
"y": 3.478499327369026
},
"isLocked": false,
"linkedName": "Top Side Shoot"
"linkedName": null
},
{
"anchor": {
"x": 8.166630800854193,
"y": 4.34729277791889
"x": 3.0013182155993943,
"y": 5.17790207339674
},
"prevControl": {
"x": 6.841112098890864,
"y": 6.429546609093219
"x": 4.795439044581793,
"y": 5.480762401339618
},
"nextControl": null,
"isLocked": false,
Expand All @@ -32,18 +32,21 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.55,
"maxAcceleration": 5.5,
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": -66.116446904775,
"rotation": 0,
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"previewStartingState": null,
"useDefaultConstraints": false
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
},
"useDefaultConstraints": true
}
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/Ferry Shot to E.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 5.135414608792181,
"y": 6.653128792368697
"x": 5.499492913428859,
"y": 6.563657142562062
},
"prevControl": null,
"nextControl": {
"x": 5.815009430944788,
"y": 6.526818220303108
"x": 6.179087735581466,
"y": 6.437346570496473
},
"isLocked": false,
"linkedName": "Ferry Shot"
Expand Down Expand Up @@ -43,7 +43,7 @@
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"folder": "Top Ferry",
"previewStartingState": {
"rotation": 0,
"velocity": 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,37 @@
"waypoints": [
{
"anchor": {
"x": 8.054038020113078,
"y": 4.244082728906199
"x": 5.499492913428859,
"y": 6.563657142562062
},
"prevControl": null,
"nextControl": {
"x": 7.772039976857732,
"y": 6.730308751728615
"x": 6.7801243426560935,
"y": 6.476519652113379
},
"isLocked": false,
"linkedName": null
"linkedName": "Ferry Shot"
},
{
"anchor": {
"x": 2.729397148609112,
"y": 6.342607879660204
"x": 8.153314996088682,
"y": 3.8006001937929805
},
"prevControl": {
"x": 5.268376231196907,
"y": 7.065196991505094
"x": 8.13811259531351,
"y": 3.7853977930178084
},
"nextControl": null,
"isLocked": false,
"linkedName": "Top Side Shoot"
"linkedName": "F"
}
],
"rotationTargets": [],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 5.55,
"maxAcceleration": 5.5,
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand All @@ -43,7 +43,7 @@
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"folder": "Top Ferry",
"previewStartingState": null,
"useDefaultConstraints": false
}
Loading
Loading