Skip to content

Commit

Permalink
Merge branch 'develop' into TelePath
Browse files Browse the repository at this point in the history
  • Loading branch information
tbowers7 committed Feb 8, 2025
2 parents 461661b + 0162e39 commit fe23c10
Show file tree
Hide file tree
Showing 53 changed files with 1,368 additions and 654 deletions.
1 change: 1 addition & 0 deletions .SysId/sysid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions .roboRIOTeamNumberSetter/roborioteamnumbersetter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
58 changes: 58 additions & 0 deletions src/main/deploy/pathplanner/autos/Command Test.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "deadline",
"data": {
"commands": [
{
"type": "sequential",
"data": {
"commands": [
{
"type": "race",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "L4"
}
},
{
"type": "wait",
"data": {
"waitTime": 2.5
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Bottom"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "Pathn"
}
}
]
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/T1.auto
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/T2.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/autos/T3.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/T4.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/main/deploy/pathplanner/autos/T5.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/T6.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions src/main/deploy/pathplanner/autos/T7.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/autos/T8.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -266,7 +266,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/autos/T9.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -266,7 +266,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/T90.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -266,7 +266,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -337,7 +337,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
10 changes: 5 additions & 5 deletions src/main/deploy/pathplanner/autos/U1.auto
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -195,7 +195,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -266,7 +266,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down Expand Up @@ -337,7 +337,7 @@
{
"type": "named",
"data": {
"name": "Ground"
"name": "L0"
}
}
]
Expand Down
54 changes: 54 additions & 0 deletions src/main/deploy/pathplanner/paths/Pathn.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"version": "2025.0",
"waypoints": [
{
"anchor": {
"x": 8.782395471643518,
"y": 6.157399811921295
},
"prevControl": null,
"nextControl": {
"x": 8.532395471643518,
"y": 6.157399811921295
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 8.782395471643518,
"y": 6.157399811921295
},
"prevControl": {
"x": 9.03239547164352,
"y": 6.157399811921295
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 0.1,
"maxAcceleration": 0.1,
"maxAngularVelocity": 0.1,
"maxAngularAcceleration": 0.1,
"nominalVoltage": 12.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
},
"reversed": false,
"folder": null,
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": false
}
Loading

0 comments on commit fe23c10

Please sign in to comment.