Skip to content

Commit

Permalink
Merge pull request #17 from frc461/optimize-subsystems
Browse files Browse the repository at this point in the history
Build Auto + Optimize Subsystems
  • Loading branch information
ez500 authored Feb 18, 2024
2 parents 8586674 + 2cf597e commit 7ab9c79
Show file tree
Hide file tree
Showing 48 changed files with 1,530 additions and 485 deletions.
17 changes: 9 additions & 8 deletions .pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"robotWidth": 0.9,
"robotLength": 0.9,
"robotWidth": 0.61,
"robotLength": 0.66,
"holonomicMode": true,
"pathFolders": [
"paths"
],
"autoFolders": [
"autos"
]
"pathFolders": [],
"autoFolders": [],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 4.5
}
4 changes: 2 additions & 2 deletions src/main/.pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"robotWidth": 0.9,
"robotLength": 0.9,
"robotWidth": 0.6096,
"robotLength": 0.66,
"holonomicMode": true,
"pathFolders": [],
"autoFolders": [],
Expand Down
25 changes: 0 additions & 25 deletions src/main/deploy/pathplanner/autos/2.2.0.auto

This file was deleted.

31 changes: 0 additions & 31 deletions src/main/deploy/pathplanner/autos/2.2.4.auto

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,32 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.73,
"y": 6.7
"x": 0.6445593933841892,
"y": 6.546038494920592
},
"rotation": 60.0
"rotation": -30.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"type": "parallel",
"data": {
"pathName": "3.3.0"
"commands": [
{
"type": "named",
"data": {
"name": "align"
}
}
]
}
},
{
"type": "path",
"data": {
"pathName": "0.3.5"
"pathName": "3.3.0"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"version": 1.0,
"startingPose": {
"position": {
"x": 0.69,
"y": 4.38
"x": 0.59,
"y": 4.48
},
"rotation": 120.0
"rotation": -150.0
},
"command": {
"type": "sequential",
Expand Down
25 changes: 0 additions & 25 deletions src/main/deploy/pathplanner/autos/3.3.0.auto

This file was deleted.

49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/3PCenter.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.1892520467505387,
"y": 5.339933333895103
},
"rotation": -90.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "3PStart"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "3PFinish"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/3PCenterArchive.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.1892520467505387,
"y": 5.339933333895103
},
"rotation": -90.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "3PStart"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "toFirstArchive"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/3PLeft.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 0.6445593933841892,
"y": 6.546038494920592
},
"rotation": -30.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "3.3.0"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "0.3.5"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
49 changes: 49 additions & 0 deletions src/main/deploy/pathplanner/autos/3PMiddle.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"version": 1.0,
"startingPose": {
"position": {
"x": 1.1892520467505387,
"y": 5.339933333895103
},
"rotation": -90.0
},
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "3PStart"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
},
{
"type": "path",
"data": {
"pathName": "0.2.4"
}
},
{
"type": "named",
"data": {
"name": "autoShoot"
}
}
]
}
},
"folder": null,
"choreoAuto": false
}
Loading

0 comments on commit 7ab9c79

Please sign in to comment.