Skip to content

Commit 650581c

Browse files
y0shiy0shi
authored
Development merge for Albany comp. (#47)
2 parents 901bbdf + 32b109f commit 650581c

18 files changed

Lines changed: 675 additions & 79 deletions

src/main/deploy/pathplanner/autos/4Ring.auto renamed to src/main/deploy/pathplanner/autos/4RingClose.auto

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": 1.0,
33
"startingPose": {
44
"position": {
5-
"x": 1.4,
5+
"x": 1.45,
66
"y": 5.56
77
},
88
"rotation": 0
@@ -22,15 +22,15 @@
2222
"data": {
2323
"commands": [
2424
{
25-
"type": "path",
25+
"type": "named",
2626
"data": {
27-
"pathName": "SubwooferToCenterRing"
27+
"name": "RunIntake"
2828
}
2929
},
3030
{
31-
"type": "named",
31+
"type": "path",
3232
"data": {
33-
"name": "RunIntake"
33+
"pathName": "SubwooferToCenterRing"
3434
}
3535
}
3636
]
@@ -47,15 +47,15 @@
4747
"data": {
4848
"commands": [
4949
{
50-
"type": "path",
50+
"type": "named",
5151
"data": {
52-
"pathName": "CenterRingToPodiumRing"
52+
"name": "RunIntake"
5353
}
5454
},
5555
{
56-
"type": "named",
56+
"type": "path",
5757
"data": {
58-
"name": "RunIntake"
58+
"pathName": "CenterRingToPodiumRing"
5959
}
6060
}
6161
]
@@ -70,23 +70,23 @@
7070
{
7171
"type": "named",
7272
"data": {
73-
"name": "PodiumRingShot"
73+
"name": "FirstShot"
7474
}
7575
},
7676
{
7777
"type": "parallel",
7878
"data": {
7979
"commands": [
8080
{
81-
"type": "path",
81+
"type": "named",
8282
"data": {
83-
"pathName": "PodiumShotToAmpRing"
83+
"name": "RunIntake"
8484
}
8585
},
8686
{
87-
"type": "named",
87+
"type": "path",
8888
"data": {
89-
"name": "RunIntake"
89+
"pathName": "SpeakerToAmpRing"
9090
}
9191
}
9292
]
@@ -101,7 +101,7 @@
101101
{
102102
"type": "named",
103103
"data": {
104-
"name": "AutoAmpRingShot"
104+
"name": "FirstShot"
105105
}
106106
}
107107
]

‎src/main/deploy/pathplanner/autos/Forward 2, Back 2 with Rotation.auto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{
2727
"type": "path",
2828
"data": {
29-
"pathName": "Go backward 2 (facing back) while turning 180"
29+
"pathName": "4 piece auton side sub"
3030
}
3131
}
3232
]

‎src/main/deploy/pathplanner/autos/Subside 3 piece auton (center pieces).auto‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.7401886415755699,
6+
"y": 4.368142031576503
7+
},
8+
"rotation": -58.79807471543254
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "FirstShot"
18+
}
19+
},
20+
{
21+
"type": "parallel",
22+
"data": {
23+
"commands": [
24+
{
25+
"type": "path",
26+
"data": {
27+
"pathName": "4 piece auton side sub"
28+
}
29+
},
30+
{
31+
"type": "named",
32+
"data": {
33+
"name": "RunIntake"
34+
}
35+
}
36+
]
37+
}
38+
},
39+
{
40+
"type": "path",
41+
"data": {
42+
"pathName": "Mid note to shoot to mid note intake"
43+
}
44+
},
45+
{
46+
"type": "named",
47+
"data": {
48+
"name": "PodiumRingShot"
49+
}
50+
},
51+
{
52+
"type": "parallel",
53+
"data": {
54+
"commands": [
55+
{
56+
"type": "path",
57+
"data": {
58+
"pathName": "2 shoot note to 3 intake note"
59+
}
60+
},
61+
{
62+
"type": "named",
63+
"data": {
64+
"name": "RunIntake"
65+
}
66+
}
67+
]
68+
}
69+
},
70+
{
71+
"type": "path",
72+
"data": {
73+
"pathName": "3 note shoot "
74+
}
75+
},
76+
{
77+
"type": "named",
78+
"data": {
79+
"name": "PodiumRingShot"
80+
}
81+
}
82+
]
83+
}
84+
},
85+
"folder": null,
86+
"choreoAuto": false
87+
}

‎src/main/deploy/pathplanner/paths/2 shoot note to 3 intake note.path‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 2.9,
7+
"y": 3.18
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 3.057871084972939,
12+
"y": 1.5519544362165634
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 6.0205935796487,
20+
"y": 1.8549852484320344
21+
},
22+
"prevControl": {
23+
"x": 4.066938903108578,
24+
"y": 1.0828977550262793
25+
},
26+
"nextControl": {
27+
"x": 6.485597341807426,
28+
"y": 2.038755488618595
29+
},
30+
"isLocked": false,
31+
"linkedName": null
32+
},
33+
{
34+
"anchor": {
35+
"x": 8.03,
36+
"y": 2.41
37+
},
38+
"prevControl": {
39+
"x": 6.731013462026925,
40+
"y": 2.5062034739454093
41+
},
42+
"nextControl": null,
43+
"isLocked": false,
44+
"linkedName": null
45+
}
46+
],
47+
"rotationTargets": [],
48+
"constraintZones": [],
49+
"eventMarkers": [],
50+
"globalConstraints": {
51+
"maxVelocity": 3.0,
52+
"maxAcceleration": 3.0,
53+
"maxAngularVelocity": 540.0,
54+
"maxAngularAcceleration": 720.0
55+
},
56+
"goalEndState": {
57+
"velocity": 0,
58+
"rotation": 0,
59+
"rotateFast": true
60+
},
61+
"reversed": false,
62+
"folder": null,
63+
"previewStartingState": {
64+
"rotation": -49.355651196764306,
65+
"velocity": 0
66+
},
67+
"useDefaultConstraints": true
68+
}

‎src/main/deploy/pathplanner/paths/3 note shoot .path‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 8.03,
7+
"y": 2.41
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 5.967808952540981,
12+
"y": 1.1470313202164872
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 2.9,
20+
"y": 3.18
21+
},
22+
"prevControl": {
23+
"x": 3.8005314472192597,
24+
"y": 2.5555381880042307
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [],
32+
"constraintZones": [],
33+
"eventMarkers": [],
34+
"globalConstraints": {
35+
"maxVelocity": 3.0,
36+
"maxAcceleration": 3.0,
37+
"maxAngularVelocity": 540.0,
38+
"maxAngularAcceleration": 720.0
39+
},
40+
"goalEndState": {
41+
"velocity": 0,
42+
"rotation": -40.0,
43+
"rotateFast": false
44+
},
45+
"reversed": false,
46+
"folder": null,
47+
"previewStartingState": {
48+
"rotation": -1.1137212617254326,
49+
"velocity": 0
50+
},
51+
"useDefaultConstraints": true
52+
}

‎src/main/deploy/pathplanner/paths/4 piece auton side sub.path‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 0.7401886415755699,
7+
"y": 4.368142031576503
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 1.9356792559738978,
12+
"y": 0.2664074558918357
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 8.05,
20+
"y": 0.7
21+
},
22+
"prevControl": {
23+
"x": 3.8796633890216263,
24+
"y": 0.7
25+
},
26+
"nextControl": null,
27+
"isLocked": false,
28+
"linkedName": null
29+
}
30+
],
31+
"rotationTargets": [
32+
{
33+
"waypointRelativePos": 0.5,
34+
"rotationDegrees": 0,
35+
"rotateFast": false
36+
}
37+
],
38+
"constraintZones": [],
39+
"eventMarkers": [
40+
{
41+
"name": "New Event Marker",
42+
"waypointRelativePos": 1.0,
43+
"command": {
44+
"type": "sequential",
45+
"data": {
46+
"commands": []
47+
}
48+
}
49+
}
50+
],
51+
"globalConstraints": {
52+
"maxVelocity": 3.0,
53+
"maxAcceleration": 3.0,
54+
"maxAngularVelocity": 540.0,
55+
"maxAngularAcceleration": 720.0
56+
},
57+
"goalEndState": {
58+
"velocity": 0,
59+
"rotation": 0.0,
60+
"rotateFast": false
61+
},
62+
"reversed": false,
63+
"folder": null,
64+
"previewStartingState": {
65+
"rotation": -59.55482726614664,
66+
"velocity": 0
67+
},
68+
"useDefaultConstraints": true
69+
}

0 commit comments

Comments
 (0)