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

Commit

Permalink
Merge branch 'stu_unh_event' into adam_real_enumerated_tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Java4First
Java4First committed May 28, 2024
2 parents 5228412 + bc3a084 commit 6099ce3
Show file tree
Hide file tree
Showing 33 changed files with 432 additions and 156 deletions.
4 changes: 2 additions & 2 deletions .pathplanner/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"autoFolders": [
"Stu"
],
"defaultMaxVel": 1.0,
"defaultMaxAccel": 1.0,
"defaultMaxVel": 1.5,
"defaultMaxAccel": 1.5,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 2.25
Expand Down
Binary file removed ctre_sim/Talon FX vers. C - 033 - 0 - ext.dat
View file
Binary file not shown.
Binary file removed ctre_sim/Talon FX vers. C - 050 - 0 - ext.dat
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions ...anner/autos/Sit Still and Shoot Auto.auto → ...er/autos/Middle Sit Still Shoot Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.5593816901919524,
"y": 7.241772197830111
"x": 1.35,
"y": 5.56
},
"rotation": 0
"rotation": 0.0
},
"command": {
"type": "sequential",
Expand All @@ -14,12 +14,12 @@
{
"type": "named",
"data": {
"name": "Shoot Auto w/ Pre-Load"
"name": "Shoot Auto AMP w/ Pre-Load"
}
}
]
}
},
"folder": "Stu",
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/Narrow 1 Note Shoot Return Auto.auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.5,
"y": 6.97
},
"rotation": 0.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Delay Auto Start"
}
},
{
"type": "path",
"data": {
"pathName": "Narrow Path 01"
}
},
{
"type": "named",
"data": {
"name": "Shoot Auto AMP w/ Pre-Load"
}
},
{
"type": "wait",
"data": {
"waitTime": 1.0
}
},
{
"type": "path",
"data": {
"pathName": "Narrow Path 01 Return"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/Narrow 1 Note Shoot Scoot Auto.auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.5,
"y": 6.97
},
"rotation": 0.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Delay Auto Start"
}
},
{
"type": "path",
"data": {
"pathName": "Narrow Path 01"
}
},
{
"type": "named",
"data": {
"name": "Shoot Auto AMP w/ Pre-Load"
}
},
{
"type": "wait",
"data": {
"waitTime": 1.0
}
},
{
"type": "path",
"data": {
"pathName": "Narrow Path 01 Clear"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
6 changes: 6 additions & 0 deletions src/main/deploy/pathplanner/autos/Narrow 2 Notes Climb Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Delay Auto Start"
}
},
{
"type": "path",
"data": {
Expand Down
8 changes: 7 additions & 1 deletion ...nner/autos/Narrow 4 Notes Shoot Auto.auto → ...nner/autos/Narrow 3 Notes Shoot Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Delay Auto Start"
}
},
{
"type": "path",
"data": {
Expand All @@ -26,7 +32,7 @@
{
"type": "wait",
"data": {
"waitTime": 2.0
"waitTime": 0.5
}
},
{
Expand Down
31 changes: 0 additions & 31 deletions src/main/deploy/pathplanner/autos/Narrow Shoot Auto.auto
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/Sit Still Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.5593816901919524,
"y": 7.241772197830111
"x": 0.5,
"y": 6.97
},
"rotation": 0
},
Expand Down
16 changes: 14 additions & 2 deletions ...oy/pathplanner/autos/Wide Shoot Auto.auto → ...r/autos/Wide 1 Note Shoot Scoot Auto.auto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "Delay Auto Start"
}
},
{
"type": "path",
"data": {
Expand All @@ -20,7 +26,13 @@
{
"type": "named",
"data": {
"name": "Shoot Auto w/ Pre-Load"
"name": "Shoot Auto AMP w/ Pre-Load"
}
},
{
"type": "wait",
"data": {
"waitTime": 2.0
}
},
{
Expand All @@ -32,6 +44,6 @@
]
}
},
"folder": "Stu",
"folder": null,
"choreoAuto": false
}
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/1+Curve-Around.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/1+Straight-to-Line.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Angle Test Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Climb Path 01.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 01 Start Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 02 Notes Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 02 Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 03 Note 1 Pickup Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 03 Note 1 Shoot Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 03 Note 2 Pickup Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/paths/Narrow 03 Note 2 Shoot Path.path
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"constraintZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 1.0,
"maxAcceleration": 1.0,
"maxVelocity": 1.5,
"maxAcceleration": 1.5,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0
},
Expand Down
Loading

0 comments on commit 6099ce3

Please sign in to comment.