Skip to content

Commit

Permalink
Changes from NYC Regional (#102)
Browse files Browse the repository at this point in the history
* pr

* Shuffleboard config

* Add logging + calibrated amp distance

* Remove kA term

* HP attention on far side of field

* Add advantage scope config

* Tune 5 piece

* Tune 5 piece

* Robot relative swerve drive bind, operator intake forever bind

* Change lift height handoff checking

* Revert B to A

* Halve trap score speed

* 5 Piece

* Clamp drive speed while ferry shooting

* Robot relative drive also intakes

* 5 piece

* Remove some auton chooser

* Lift coast

* Lift idle mode

* Red HGF, Blue CBAED

* Move ferry target

* Fix typo

* red 5 piece

* 20% trap speed

* 5 piece first shot

* Debounce ferry

* Re zero front right

* Increase shoot timeout on second hgf

* pull out G to shoot

* adjust blue hgf

---------

Co-authored-by: Prog694 <prog692@gmail.com>
  • Loading branch information
BenG49 and Prog694 authored Apr 8, 2024
1 parent 744b797 commit 4290558
Show file tree
Hide file tree
Showing 36 changed files with 1,116 additions and 94 deletions.
449 changes: 449 additions & 0 deletions advantagescope-config.json

Large diffs are not rendered by default.

17 changes: 1 addition & 16 deletions shuffleboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,6 @@
"_showGlyph": false
}
},
"6,1": {
"size": [
1,
1
],
"content": {
"_type": "Boolean Box",
"_source0": "network_table:///SmartDashboard/Note Detection/Has Note Data",
"_title": "Sees Note",
"_glyph": 148,
"_showGlyph": false,
"Colors/Color when true": "#7CFC00FF",
"Colors/Color when false": "#8B0000FF"
}
},
"6,0": {
"size": [
1,
Expand Down Expand Up @@ -168,7 +153,7 @@
"content": {
"_type": "Camera Stream",
"_source0": "camera_server://USB Camera 0",
"_title": "USB Camera 0",
"_title": "Driver Camera",
"_glyph": 148,
"_showGlyph": false,
"Crosshair/Show crosshair": true,
Expand Down
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/4 HGF Red.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": null,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Start to H (HGF) Red"
}
},
{
"type": "path",
"data": {
"pathName": "H to HShoot (HGF) Red"
}
},
{
"type": "path",
"data": {
"pathName": "HShoot to G (HGF) Red"
}
},
{
"type": "path",
"data": {
"pathName": "G to Shoot (HGF) Red"
}
},
{
"type": "path",
"data": {
"pathName": "GShoot to F (HGF)"
}
},
{
"type": "path",
"data": {
"pathName": "F to Shoot (HGF)"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
61 changes: 61 additions & 0 deletions src/main/deploy/pathplanner/autos/6 CBAED Red.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"version": 1.0,
"startingPose": null,
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Preload to C Close Red"
}
},
{
"type": "path",
"data": {
"pathName": "Close Preload to C"
}
},
{
"type": "path",
"data": {
"pathName": "C to B Red"
}
},
{
"type": "path",
"data": {
"pathName": "B to A Red"
}
},
{
"type": "path",
"data": {
"pathName": "A to E"
}
},
{
"type": "path",
"data": {
"pathName": "E to Shoot"
}
},
{
"type": "path",
"data": {
"pathName": "Shoot to D (CBAED)"
}
},
{
"type": "path",
"data": {
"pathName": "D to Shoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/A to D.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 2.70383902591167,
"x": 2.9000000000000004,
"y": 6.887856966597124
},
"prevControl": null,
"nextControl": {
"x": 3.6941070946532406,
"x": 3.890268068741571,
"y": 7.027030067557189
},
"isLocked": false,
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/paths/A to E.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"waypoints": [
{
"anchor": {
"x": 2.70383902591167,
"x": 2.9000000000000004,
"y": 6.887856966597124
},
"prevControl": null,
"nextControl": {
"x": 4.82368893835003,
"x": 5.01984991243836,
"y": 6.971014628418452
},
"isLocked": false,
Expand All @@ -17,11 +17,11 @@
{
"anchor": {
"x": 8.17,
"y": 6.042894923752811
"y": 5.84
},
"prevControl": {
"x": 7.01740860685425,
"y": 6.665124436730354
"y": 6.462229512977543
},
"nextControl": null,
"isLocked": false,
Expand All @@ -40,7 +40,7 @@
"goalEndState": {
"velocity": 0,
"rotation": 0.0,
"rotateFast": false
"rotateFast": true
},
"reversed": false,
"folder": "ABCDE",
Expand Down
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/paths/B to A Red.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 2.7,
"y": 5.27
},
"prevControl": null,
"nextControl": {
"x": 2.5306942929129037,
"y": 5.892387378210238
},
"isLocked": false,
"linkedName": "B Red"
},
{
"anchor": {
"x": 2.70383902591167,
"y": 6.887856966597124
},
"prevControl": {
"x": 2.5507512734398694,
"y": 6.452168507627614
},
"nextControl": null,
"isLocked": false,
"linkedName": "A Red"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.5,
"rotationDegrees": 52.37639263407269,
"rotateFast": true
}
],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 50.90614111377048,
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"previewStartingState": null,
"useDefaultConstraints": true
}
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/B to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"waypoints": [
{
"anchor": {
"x": 2.9260279603180286,
"y": 5.309146116867734
"x": 2.9,
"y": 5.27
},
"prevControl": null,
"nextControl": {
"x": 2.756722253230932,
"y": 5.931533495077972
"x": 2.7306942929129034,
"y": 5.892387378210238
},
"isLocked": false,
"linkedName": "B"
},
{
"anchor": {
"x": 2.70383902591167,
"x": 2.9000000000000004,
"y": 6.887856966597124
},
"prevControl": {
"x": 2.5507512734398694,
"x": 2.7469122475281997,
"y": 6.452168507627614
},
"nextControl": null,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/C to B Close.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
{
"anchor": {
"x": 2.9260279603180286,
"y": 5.309146116867734
"x": 2.9,
"y": 5.27
},
"prevControl": {
"x": 2.6241439876295614,
"y": 5.133858648855076
"x": 2.5981160273115327,
"y": 5.094712531987342
},
"nextControl": null,
"isLocked": false,
Expand Down
58 changes: 58 additions & 0 deletions src/main/deploy/pathplanner/paths/C to B Red.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": 1.0,
"waypoints": [
{
"anchor": {
"x": 2.5,
"y": 4.265328388308022
},
"prevControl": null,
"nextControl": {
"x": 2.388096855965791,
"y": 4.841379939170136
},
"isLocked": false,
"linkedName": "C"
},
{
"anchor": {
"x": 2.7,
"y": 5.27
},
"prevControl": {
"x": 2.376402701523351,
"y": 4.817991630285256
},
"nextControl": null,
"isLocked": false,
"linkedName": "B Red"
}
],
"rotationTargets": [
{
"waypointRelativePos": 0.5,
"rotationDegrees": 49.9380466176507,
"rotateFast": true
}
],
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 4.5,
"maxAcceleration": 4.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
"goalEndState": {
"velocity": 0,
"rotation": 43.876697285924436,
"rotateFast": false
},
"reversed": false,
"folder": "ABCDE",
"previewStartingState": {
"rotation": -20.0,
"velocity": 0
},
"useDefaultConstraints": true
}
14 changes: 7 additions & 7 deletions src/main/deploy/pathplanner/paths/C to B.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 2.62197994481459,
"y": 4.794603321400375
"x": 2.5401208637175103,
"y": 4.864768248055015
},
"isLocked": false,
"linkedName": "C"
},
{
"anchor": {
"x": 2.9260279603180286,
"y": 5.309146116867734
"x": 2.9,
"y": 5.27
},
"prevControl": {
"x": 2.692311336301151,
"y": 4.870927446836089
"x": 2.576402701523351,
"y": 4.817991630285256
},
"nextControl": null,
"isLocked": false,
Expand All @@ -31,7 +31,7 @@
"rotationTargets": [
{
"waypointRelativePos": 0.5,
"rotationDegrees": 34.799293349232,
"rotationDegrees": 49.9380466176507,
"rotateFast": true
}
],
Expand Down
Loading

0 comments on commit 4290558

Please sign in to comment.