Skip to content

Commit

Permalink
Merge pull request #52 from StuyPulse/pre-brunswick
Browse files Browse the repository at this point in the history
Pre brunswick
  • Loading branch information
IanShiii authored Oct 26, 2024
2 parents 76577d3 + 0e53dcb commit 8e04ba4
Show file tree
Hide file tree
Showing 39 changed files with 396 additions and 292 deletions.
Binary file added logs/FRC_TBD_0b09622a29ea64b8.wpilog
Binary file not shown.
Binary file removed logs/FRC_TBD_25d35e33ade850f9.wpilog
Binary file not shown.
8 changes: 1 addition & 7 deletions src/main/deploy/pathplanner/autos/BCA BLUE.auto
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"type": "path",
"data": {
"pathName": "Blue Center to C"
"pathName": "Blue 90 Deg B Shoot to C"
}
},
{
Expand All @@ -33,12 +33,6 @@
"data": {
"pathName": "Blue Center to A"
}
},
{
"type": "path",
"data": {
"pathName": "Blue A to Center"
}
}
]
}
Expand Down
8 changes: 1 addition & 7 deletions src/main/deploy/pathplanner/autos/BCA RED.auto
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"type": "path",
"data": {
"pathName": "Red Center to C"
"pathName": "Red 90 Deg B Shoot to C"
}
},
{
Expand All @@ -33,12 +33,6 @@
"data": {
"pathName": "Red Center to A"
}
},
{
"type": "path",
"data": {
"pathName": "Red A to Center"
}
}
]
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue 90 Deg B Shoot to C.path
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
},
"prevControl": null,
"nextControl": {
"x": 1.8887518932445275,
"y": 4.32662701436514
"x": 1.843395339506453,
"y": 4.143491955138672
},
"isLocked": false,
"linkedName": "Blue BCA B Shoot Pose"
},
{
"anchor": {
"x": 2.6238277281250206,
"y": 4.378717757621604
"x": 3.1137973538967914,
"y": 4.11421492392836
},
"prevControl": {
"x": 1.5581750644122865,
"y": 4.3785396044875196
"x": 2.048144690184057,
"y": 4.114036770794276
},
"nextControl": null,
"isLocked": false,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/Blue A to Center.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 3.101440276954628,
"y": 7.133434209888363
"x": 3.3013338050485626,
"y": 7.2749805200131235
},
"prevControl": null,
"nextControl": {
"x": 2.9106477302293583,
"y": 6.9718848238973115
"x": 3.110541258323293,
"y": 7.113431134022072
},
"isLocked": false,
"linkedName": "Blue BCA A"
Expand Down
12 changes: 6 additions & 6 deletions src/main/deploy/pathplanner/paths/Blue A to D.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 2.954672602983599,
"y": 7.029418819812343
"x": 3.2143199684464845,
"y": 7.113452071956227
},
"prevControl": null,
"nextControl": {
"x": 8.522793824407191,
"y": 7.437045490202704
"x": 8.786290798324133,
"y": 7.476231693120632
},
"isLocked": false,
"linkedName": "Blue ADEF A"
Expand All @@ -20,8 +20,8 @@
"y": 7.429163844438801
},
"prevControl": {
"x": 3.438956606648067,
"y": 7.060221406032563
"x": 3.2657732528510195,
"y": 7.0862756529426
},
"nextControl": null,
"isLocked": false,
Expand Down
40 changes: 20 additions & 20 deletions src/main/deploy/pathplanner/paths/Blue ABC Waypoints.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,45 @@
"waypoints": [
{
"anchor": {
"x": 3.101440276954628,
"y": 7.133434209888363
"x": 3.3013338050485626,
"y": 7.2749805200131235
},
"prevControl": null,
"nextControl": {
"x": 2.8769730857742335,
"y": 7.243500008770597
"x": 3.076866613868168,
"y": 7.385046318895357
},
"isLocked": false,
"linkedName": "Blue BCA A"
},
{
"anchor": {
"x": 3.1,
"y": 5.55
"x": 3.090096900059872,
"y": 5.657628859900576
},
"prevControl": {
"x": 2.8749498626139145,
"y": 5.658868892078977
"x": 2.8650467626737863,
"y": 5.7664977519795535
},
"nextControl": {
"x": 3.3250501373860857,
"y": 5.441131107921023
"x": 3.3151470374459575,
"y": 5.548759967821599
},
"isLocked": false,
"linkedName": "Blue BCA B"
},
{
"anchor": {
"x": 2.6238277281250206,
"y": 4.378717757621604
"x": 3.1137973538967914,
"y": 4.11421492392836
},
"prevControl": {
"x": 2.3975266746789083,
"y": 4.484961972566135
"x": 2.887496300450679,
"y": 4.220459138872892
},
"nextControl": {
"x": 2.850128781571133,
"y": 4.272473542677072
"x": 3.3400984073429036,
"y": 4.007970708983828
},
"isLocked": false,
"linkedName": "Blue BCA C"
Expand Down Expand Up @@ -96,12 +96,12 @@
},
{
"anchor": {
"x": 2.4,
"y": 6.43
"x": 2.2940885539509175,
"y": 6.475991589445976
},
"prevControl": {
"x": 2.1642311849658524,
"y": 6.346855151347819
"x": 2.05831973891677,
"y": 6.392846740793796
},
"nextControl": null,
"isLocked": false,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/Blue Amp to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
},
{
"anchor": {
"x": 2.954672602983599,
"y": 7.029418819812343
"x": 3.2143199684464845,
"y": 7.113452071956227
},
"prevControl": {
"x": 1.5093951667101788,
"y": 6.588627448229724
"x": 1.7690425321730643,
"y": 6.6726607003736085
},
"nextControl": null,
"isLocked": false,
Expand Down
20 changes: 10 additions & 10 deletions src/main/deploy/pathplanner/paths/Blue B to C.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
"waypoints": [
{
"anchor": {
"x": 2.6938714628917357,
"y": 5.631284339205584
"x": 3.090096900059872,
"y": 5.657628859900576
},
"prevControl": null,
"nextControl": {
"x": 2.0322297871158246,
"y": 5.373357077845108
"x": 1.7912352437800116,
"y": 5.494793717191601
},
"isLocked": false,
"linkedName": null
"linkedName": "Blue BCA B"
},
{
"anchor": {
"x": 2.8299207212253714,
"y": 4.58
"x": 3.1137973538967914,
"y": 4.11421492392836
},
"prevControl": {
"x": 2.3071646664126666,
"y": 4.837775838126081
"x": 2.395957238900271,
"y": 4.417946095006697
},
"nextControl": null,
"isLocked": false,
"linkedName": null
"linkedName": "Blue BCA C"
}
],
"rotationTargets": [],
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Blue B to Center.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 3.1,
"y": 5.55
"x": 3.090096900059872,
"y": 5.657628859900576
},
"prevControl": null,
"nextControl": {
"x": 2.85,
"y": 5.55
"x": 2.8433488902081527,
"y": 5.617436576633564
},
"isLocked": false,
"linkedName": "Blue BCA B"
},
{
"anchor": {
"x": 1.9507925278871394,
"y": 5.55
"x": 2.138713570581903,
"y": 5.514320436192957
},
"prevControl": {
"x": 2.200792527887139,
"y": 5.55
"x": 2.3857289673852144,
"y": 5.552835287122212
},
"nextControl": null,
"isLocked": false,
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/Blue B to D.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 3.1,
"y": 5.55
"x": 3.090096900059872,
"y": 5.657628859900576
},
"prevControl": null,
"nextControl": {
"x": 4.09653456185508,
"y": 5.917887071242202
"x": 4.086631461914951,
"y": 6.025515931142778
},
"isLocked": false,
"linkedName": "Blue BCA B"
Expand Down
8 changes: 4 additions & 4 deletions src/main/deploy/pathplanner/paths/Blue B to F.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"waypoints": [
{
"anchor": {
"x": 3.1,
"y": 5.55
"x": 3.090096900059872,
"y": 5.657628859900576
},
"prevControl": null,
"nextControl": {
"x": 5.044398825776819,
"y": 4.782298508049397
"x": 5.03449572583669,
"y": 4.889927367949974
},
"isLocked": false,
"linkedName": "Blue BCA B"
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Blue C to Shoot Before A.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.6238277281250206,
"y": 4.378717757621604
"x": 3.1137973538967914,
"y": 4.11421492392836
},
"prevControl": null,
"nextControl": {
"x": 2.1014736029324417,
"y": 4.3270624847953885
"x": 2.5914432287042124,
"y": 4.062559651102145
},
"isLocked": false,
"linkedName": "Blue BCA C"
},
{
"anchor": {
"x": 2.4,
"y": 6.43
"x": 2.2940885539509175,
"y": 6.475991589445976
},
"prevControl": {
"x": 2.4487602821359506,
"y": 6.028702057404115
"x": 2.3428488360868682,
"y": 6.074693646850092
},
"nextControl": null,
"isLocked": false,
Expand Down
16 changes: 8 additions & 8 deletions src/main/deploy/pathplanner/paths/Blue Center to A.path
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"waypoints": [
{
"anchor": {
"x": 2.4,
"y": 6.43
"x": 2.2940885539509175,
"y": 6.475991589445976
},
"prevControl": null,
"nextControl": {
"x": 2.8901573716465885,
"y": 6.887841058048188
"x": 3.176206283465587,
"y": 7.200482584899087
},
"isLocked": false,
"linkedName": "Blue BCA C Shoot Pose"
},
{
"anchor": {
"x": 3.101440276954628,
"y": 7.133434209888363
"x": 3.3013338050485626,
"y": 7.2749805200131235
},
"prevControl": {
"x": 2.6374369114478973,
"y": 6.684084632617781
"x": 2.616694679797016,
"y": 6.77157523067328
},
"nextControl": null,
"isLocked": false,
Expand Down
Loading

0 comments on commit 8e04ba4

Please sign in to comment.