Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Shooter assist #116

Merged
merged 29 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c4b6ee9
driverOI handlePre
qntmcube Mar 30, 2024
29c2f92
changed autons to old shootNow
qntmcube Mar 30, 2024
4508b32
adjusted auton path
qntmcube Mar 30, 2024
7583e9c
re-added DriverShootVelocityIntake in driverOI
qntmcube Mar 30, 2024
69c68c4
added timeout to auto intake and removed incorrect context ownership
qntmcube Mar 31, 2024
5506a75
resets gyro to 180 degrees of current after auton is done
qntmcube Mar 31, 2024
115597d
stop shooter at the end of an auton and other context stuff
qntmcube Apr 1, 2024
716cfda
Started making a more complete set of autons
qntmcube Apr 1, 2024
93625bc
renamed autoIntake
qntmcube Apr 2, 2024
df4e12b
defualt 4800
Leek865 Apr 2, 2024
f87f579
Shooter 4800 Changes and added center auton
qntmcube Apr 2, 2024
77d10e7
slight path tweaks
qntmcube Apr 3, 2024
4d733ae
spotless
qntmcube Apr 3, 2024
677b025
updated path
qntmcube Apr 3, 2024
288d9bf
Added midfield autons
qntmcube Apr 3, 2024
d3d8094
increased moveClimbersToBottom speed
qntmcube Apr 3, 2024
fb39f2b
slightly decreased the intake feeding time into shooter for auton
qntmcube Apr 3, 2024
21ac302
lowered climber speed back down, since it doesn't actually slow down …
qntmcube Apr 3, 2024
75f17c4
moved prox sensor threshold into a constant
qntmcube Apr 3, 2024
558ab50
Added minimal changes for shooter assist.
Leek865 Apr 4, 2024
01365d6
Added some comments.
Leek865 Apr 4, 2024
de17ba2
reverted changes
qntmcube Apr 4, 2024
fbcc394
changed intake feeding time to 1.2 seconds
qntmcube Apr 4, 2024
4271155
Changed logic to rely on should run instead of target speed.
Leek865 Apr 4, 2024
d32ee62
commented log
qntmcube Apr 4, 2024
455578d
spotless
qntmcube Apr 4, 2024
dfb73d2
Merge remote-tracking branch 'origin/Better-Auton-Paths' into Shooter…
dejabot Apr 4, 2024
96a1d07
Merge remote-tracking branch 'origin/Better-Auton-Paths' into Shooter…
dejabot Apr 4, 2024
29103d6
Merge remote-tracking branch 'origin/main' into Shooter-Assist
dejabot Apr 4, 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
9 changes: 3 additions & 6 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"robotWidth": 0.9,
"robotLength": 0.9,
"robotWidth": 0.97,
"robotLength": 0.97,
"holonomicMode": true,
"pathFolders": [
"RevA",
"gatorade"
],
"pathFolders": [],
"autoFolders": [],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@
"waypoints": [
{
"anchor": {
"x": 0.7483342975945213,
"y": 6.675397934129203
"x": 0.7128224395337682,
"y": 6.718986067601764
},
"prevControl": null,
"nextControl": {
"x": 2.3770102493908696,
"y": 6.456447732339909
"x": 1.988042573307369,
"y": 6.3556130584483395
},
"isLocked": false,
"linkedName": null
"linkedName": "Amp Side Start"
},
{
"anchor": {
"x": 2.809031599544681,
"y": 6.921961871701522
"x": 2.8691879744870605,
"y": 6.9776644182918
},
"prevControl": {
"x": 2.2404261799264344,
"y": 6.638104544727609
"x": 1.67324598538086,
"y": 6.336669441857402
},
"nextControl": null,
"isLocked": false,
"linkedName": "3 Piece 1"
"linkedName": "Top Piece"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.2,
"rotationDegrees": 37.38608672087997,
"waypointRelativePos": 0.25,
"rotationDegrees": 60.0,
"rotateFast": false
}
],
Expand All @@ -45,13 +45,13 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 36.0,
"rotation": 31.5,
"rotateFast": true
},
"reversed": false,
"folder": "RevA",
"folder": null,
"previewStartingState": {
"rotation": 59.33438905954238,
"rotation": 60.0,
"velocity": 0
},
"useDefaultConstraints": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,41 @@
"waypoints": [
{
"anchor": {
"x": 2.0,
"y": 7.0
"x": 2.496610386739292,
"y": 4.342898333944817
},
"prevControl": null,
"nextControl": {
"x": 3.0,
"y": 7.0
"x": 2.033174700608661,
"y": 4.891906908813818
},
"isLocked": false,
"linkedName": null
"linkedName": "Bottom Piece"
},
{
"anchor": {
"x": 2.9208403278961947,
"y": 7.0
"x": 2.8691879744870605,
"y": 6.9776644182918
},
"prevControl": {
"x": 2.647327938174395,
"y": 6.99797387557738
},
"nextControl": {
"x": 3.2912178856275127,
"y": 7.0027436819811815
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 3.4866439657691353,
"y": 6.6044715548077715
},
"prevControl": {
"x": 4.13474631460541,
"y": 7.149700514939878
"x": 2.1594852726731264,
"y": 6.5465932181858735
},
"nextControl": null,
"isLocked": false,
"linkedName": "intake test 1"
"linkedName": "Top Piece"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.9,
"waypointRelativePos": 0.15,
"rotationDegrees": 0,
"rotateFast": false
},
{
"waypointRelativePos": 0.65,
"rotationDegrees": 65.51032725616209,
"rotateFast": true
}
],
"constraintZones": [],
Expand All @@ -61,13 +50,13 @@
},
"goalEndState": {
"velocity": 0,
"rotation": -98.13010235415607,
"rotation": 31.5,
"rotateFast": false
},
"reversed": false,
"folder": "gatorade",
"folder": null,
"previewStartingState": {
"rotation": -140.22201891090498,
"rotation": -31.5,
"velocity": 0
},
"useDefaultConstraints": true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,93 +3,93 @@
"waypoints": [
{
"anchor": {
"x": 2.0,
"y": 7.0
"x": 0.7132975145579924,
"y": 4.40352978391142
},
"prevControl": null,
"nextControl": {
"x": 3.78497679301123,
"y": 7.746366169424069
"x": 0.7139507427163005,
"y": 3.9251886188957568
},
"isLocked": false,
"linkedName": null
"linkedName": "Bottom Start"
},
{
"anchor": {
"x": 1.892106440854486,
"y": 6.625046232543462
"x": 2.0177347623213766,
"y": 1.3250436269391064
},
"prevControl": {
"x": 3.666472230445174,
"y": 6.262107775581731
"x": 0.5501092437370062,
"y": 2.1267327303173134
},
"nextControl": {
"x": 0.9868206202577819,
"y": 6.81021833221097
"x": 3.8443245108246487,
"y": 0.32727063977417226
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 1.892106440854486,
"y": 6.028380578064414
"x": 8.214257072032662,
"y": 0.7568538979670562
},
"prevControl": {
"x": 0.4814081429543926,
"y": 6.097759182890737
"x": 7.759606904612749,
"y": 1.1302501893122792
},
"nextControl": {
"x": 2.519634111949928,
"y": 5.997518561448019
"x": 8.548531735952361,
"y": 0.48231991834354104
},
"isLocked": false,
"linkedName": null
"linkedName": "Bottom Midfield"
},
{
"anchor": {
"x": 1.892106440854486,
"y": 7.0
"x": 2.2572913432863904,
"y": 1.0581702320812059
},
"prevControl": {
"x": 3.373483238194546,
"y": 7.005677770748894
"x": 3.286422614511896,
"y": 0.5297680363879256
},
"nextControl": {
"x": 0.4107296435144261,
"y": 6.994322229251106
"x": 1.40343002029556,
"y": 1.4965809679134259
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 2.0,
"y": 7.0
"x": 0.7132975145579924,
"y": 4.40352978391142
},
"prevControl": {
"x": 1.2593116013299703,
"y": 6.973747551510271
"x": 1.0087347952473684,
"y": 2.9745634954232876
},
"nextControl": null,
"isLocked": false,
"linkedName": null
"linkedName": "Bottom Start"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.5,
"rotationDegrees": 92.17550814898085,
"rotationDegrees": 0,
"rotateFast": false
},
{
"waypointRelativePos": 2.0,
"rotationDegrees": -89.42127443439517,
"rotationDegrees": 0.0,
"rotateFast": false
},
{
"waypointRelativePos": 2.9,
"rotationDegrees": 1.583432759888603,
"waypointRelativePos": 2.8,
"rotationDegrees": 0,
"rotateFast": false
}
],
Expand All @@ -103,13 +103,13 @@
},
"goalEndState": {
"velocity": 0,
"rotation": 0,
"rotateFast": false
"rotation": -60.0,
"rotateFast": true
},
"reversed": false,
"folder": "gatorade",
"folder": null,
"previewStartingState": {
"rotation": 0,
"rotation": -60.0,
"velocity": 0
},
"useDefaultConstraints": true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 0.7132975145579924,
"y": 4.40352978391142
},
"prevControl": null,
"nextControl": {
"x": 1.7176655001447887,
"y": 4.387436617470951
},
"isLocked": false,
"linkedName": "Bottom Start"
},
{
"anchor": {
"x": 2.496610386739292,
"y": 4.342898333944817
},
"prevControl": {
"x": 1.876340558235646,
"y": 4.303526491317366
},
"nextControl": null,
"isLocked": false,
"linkedName": "Bottom Piece"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.6,
"rotationDegrees": 0,
"rotateFast": true
},
{
"waypointRelativePos": 0.05,
"rotationDegrees": -60.0,
"rotateFast": false
}
],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": -31.5,
"rotateFast": false
},
"reversed": false,
"folder": null,
"previewStartingState": {
"rotation": -60.0,
"velocity": 0
},
"useDefaultConstraints": false
}
Loading
Loading