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

Jump to bottom

merge AZ East into dev #32

Merged
merged 58 commits into from
Apr 2, 2024
Merged

merge AZ East into dev #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ce5a364
Merge branch 'dev' into feat/path-planner
samanthanguyen23 Mar 8, 2024
b468ca2
Merge branch 'feat/four-note-auto' into feat/path-planner
BrandonTheBusyBeaver117 Mar 16, 2024
5202675
incomplete 4-note
JayK445 Mar 16, 2024
af01d64
spotless
JayK445 Mar 16, 2024
5e5905a
adjust limelight position for new mount
audreypj Mar 16, 2024
fa96de6
correct ll position offsets
audreypj Mar 16, 2024
a44c142
test
JayK445 Mar 16, 2024
1fdb0c6
test
JayK445 Mar 16, 2024
c8c5ae9
register speakerlock
JayK445 Mar 16, 2024
6a9de7e
angle drivebase as separate commands
audreypj Mar 16, 2024
392d765
integrate rotation override into autonomous drive
JayK445 Mar 16, 2024
1e31a71
auto heading drive
JayK445 Mar 16, 2024
ddd4a0b
clean, better end condition
JayK445 Mar 16, 2024
beb017e
merge feat/four-note-auto
JayK445 Mar 17, 2024
7e06fe8
spotless, complete merge
JayK445 Mar 17, 2024
645051f
Merge branch 'feat/four-note-auto' into feat/auto-target-lock
JayK445 Mar 17, 2024
9949f76
Merge branch 'feat/four-note-auto' into feat/centerline-auto
audreypj Mar 17, 2024
338b300
make auto
audreypj Mar 17, 2024
d3ac4ff
test
JayK445 Mar 17, 2024
20eb475
test
JayK445 Mar 17, 2024
d3eb214
start optimizing for 5 note, updated target equation
JayK445 Mar 18, 2024
893a79a
merge in moving target lock
JayK445 Mar 18, 2024
bf9795a
incomplete, inconsistent 5 note, over time limit
JayK445 Mar 18, 2024
2776f45
calibrate swerve
JayK445 Mar 18, 2024
f859947
spotless
JayK445 Mar 18, 2024
9feb19d
merge dev
JayK445 Mar 21, 2024
43f3a1d
update path to keep april tags in view
audreypj Mar 21, 2024
0d9d5ae
adjust pose 1 3 note centerline auto
audreypj Mar 21, 2024
a791d4e
Merge branch 'feat/centerline-auto' into comp/az-east
JayK445 Mar 21, 2024
a122f19
Merge branch 'feat/five-note-auto' into comp/az-east
JayK445 Mar 21, 2024
3a6223e
Log angular error
LexieLev Mar 21, 2024
5cc7481
improved shuttle setpoints, better? rgb lights
JayK445 Mar 21, 2024
1b9efdb
bug fix
JayK445 Mar 21, 2024
f870cfb
Shift auto over for fourth shot
LexieLev Mar 21, 2024
b59f233
Merge branch 'comp/az-east' of https://github.com/Iron-Panthers/FRC-2…
LexieLev Mar 21, 2024
2f849d1
Low angle under stage
LexieLev Mar 22, 2024
c69d7e2
auto zero
JayK445 Mar 22, 2024
949a915
Merge branch 'feat/auto-zero' into comp/az-east
JayK445 Mar 22, 2024
d7a8978
fix compiler error
JayK445 Mar 22, 2024
da82aec
reinvert auto zeroing, new speaker setpoint
JayK445 Mar 22, 2024
fa9a62d
spotless
JayK445 Mar 22, 2024
0d1fc73
restore old shuttle, move new binding, zeroing autos
LexieLev Mar 22, 2024
11e33d7
RGB only go red for speaker tags
LexieLev Mar 22, 2024
6d0d011
fix compile error
JayK445 Mar 22, 2024
de0a793
update path, remove unused cam, cal swerve mod 4, fix null excep
JayK445 Mar 22, 2024
8f54822
recenter pose and zero for leave
audreypj Mar 22, 2024
26ab49f
move on if intake fails
audreypj Mar 22, 2024
c1dcd89
give the intake more time
audreypj Mar 22, 2024
01d78f1
lock heading 3shotpose3
JayK445 Mar 22, 2024
b58ebcb
decrease amp shot power
audreypj Mar 22, 2024
0032228
Merge remote-tracking branch 'origin/comp/az-east' into comp/az-east
audreypj Mar 22, 2024
580d642
red side 4note
JayK445 Mar 23, 2024
daeec95
amp tune
JayK445 Mar 23, 2024
c285bc3
red 4note no stage crash
JayK445 Mar 23, 2024
9d8e6ec
3shotpose3 lock intake heading
JayK445 Mar 23, 2024
b681d07
reduced rot override delay 3shotpose3
JayK445 Mar 23, 2024
2d75fa8
address RED4shotpose2 inaccuracies
JayK445 Mar 23, 2024
a2d877b
mod blue4notepose2 to avoid stage crash
JayK445 Mar 23, 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
14 changes: 6 additions & 8 deletions .pathplanner/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"robotWidth": 0.85,
"robotLength": 0.85,
"robotWidth": 0.9,
"robotLength": 0.9,
"holonomicMode": true,
"pathFolders": [
"4notepose2"
"Red 4NotePose2"
],
"autoFolders": [
"New Folder"
],
"defaultMaxVel": 1.0,
"defaultMaxAccel": 1.0,
"autoFolders": [],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 4.5
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/1shotLeavePose3.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"type": "named",
"data": {
"name": "recenterPose3"
"name": "ZeroSubwoofer3"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/2ShotPose2.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"type": "named",
"data": {
"name": "recenterPose2"
"name": "ZeroOrigin"
}
},
{
Expand Down
272 changes: 272 additions & 0 deletions src/main/deploy/pathplanner/autos/3shotPose3.auto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
{
"version": 1.0,
"startingPose": null,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "ZeroSubwoofer3"
}
},
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
},
{
"type": "parallel",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "AngleAtSpeaker"
}
},
{
"type": "named",
"data": {
"name": "ShooterRampUpCommand"
}
}
]
}
},
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "named",
"data": {
"name": "ShootCommand"
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Pose3intake1"
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "race",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "MaintainShooterVelocity"
}
},
{
"type": "wait",
"data": {
"waitTime": 1.25
}
}
]
}
},
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
}
]
}
}
]
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 1.0
}
},
{
"type": "named",
"data": {
"name": "LockForward"
}
}
]
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Pose3shoot1"
}
},
{
"type": "named",
"data": {
"name": "AutoPivotAngle"
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "named",
"data": {
"name": "AutoPivotAngle"
}
},
{
"type": "named",
"data": {
"name": "AutoDrivebaseAngle"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "ShootCommand"
}
},
{
"type": "race",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Pose3intake2"
}
},
{
"type": "named",
"data": {
"name": "IntakeCommand"
}
}
]
}
},
{
"type": "sequential",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "named",
"data": {
"name": "LockForward"
}
}
]
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Pose3shoot2"
}
},
{
"type": "named",
"data": {
"name": "AutoPivotAngle"
}
}
]
}
},
{
"type": "deadline",
"data": {
"commands": [
{
"type": "wait",
"data": {
"waitTime": 0.5
}
},
{
"type": "named",
"data": {
"name": "AutoPivotAngle"
}
},
{
"type": "named",
"data": {
"name": "AutoDrivebaseAngle"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "ShootCommand"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Loading
Loading