Skip to content

Commit 1d75785

Browse files
Yuriana101Yuriana101
committed
Merge branch 'Improvements-Staging' of https://github.com/FRC-7525/Reefscape-7917 into Improvements-Staging
2 parents 219a95b + 2d50671 commit 1d75785

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1088
-392
lines changed

‎src/main/deploy/pathplanner/autos/1 Coral - BC.auto‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@
55
"data": {
66
"commands": [
77
{
8-
"type": "path",
8+
"type": "parallel",
99
"data": {
10-
"pathName": "BSL to BSC"
10+
"commands": [
11+
{
12+
"type": "path",
13+
"data": {
14+
"pathName": "BSL to BSC"
15+
}
16+
},
17+
{
18+
"type": "named",
19+
"data": {
20+
"name": "Idle"
21+
}
22+
}
23+
]
1124
}
1225
},
1326
{
@@ -17,9 +30,22 @@
1730
}
1831
},
1932
{
20-
"type": "path",
33+
"type": "sequential",
2134
"data": {
22-
"pathName": "BSC to BW"
35+
"commands": [
36+
{
37+
"type": "path",
38+
"data": {
39+
"pathName": "BSC to BW"
40+
}
41+
},
42+
{
43+
"type": "named",
44+
"data": {
45+
"name": "Idle"
46+
}
47+
}
48+
]
2349
}
2450
}
2551
]

‎src/main/deploy/pathplanner/autos/1 Coral - M.auto‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,35 @@
55
"data": {
66
"commands": [
77
{
8-
"type": "path",
8+
"type": "parallel",
99
"data": {
10-
"pathName": "MSL to MSC"
10+
"commands": [
11+
{
12+
"type": "path",
13+
"data": {
14+
"pathName": "MSL to MSC"
15+
}
16+
},
17+
{
18+
"type": "named",
19+
"data": {
20+
"name": "Idle"
21+
}
22+
}
23+
]
1124
}
1225
},
1326
{
1427
"type": "named",
1528
"data": {
1629
"name": "Score Coral"
1730
}
31+
},
32+
{
33+
"type": "named",
34+
"data": {
35+
"name": "Idle"
36+
}
1837
}
1938
]
2039
}

‎src/main/deploy/pathplanner/autos/1 Coral - RC .auto‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@
55
"data": {
66
"commands": [
77
{
8-
"type": "path",
8+
"type": "parallel",
99
"data": {
10-
"pathName": "RSL to RSC"
10+
"commands": [
11+
{
12+
"type": "path",
13+
"data": {
14+
"pathName": "RSL to RSC"
15+
}
16+
},
17+
{
18+
"type": "named",
19+
"data": {
20+
"name": "Idle"
21+
}
22+
}
23+
]
1124
}
1225
},
1326
{
@@ -17,9 +30,22 @@
1730
}
1831
},
1932
{
20-
"type": "path",
33+
"type": "parallel",
2134
"data": {
22-
"pathName": "RSC to RW"
35+
"commands": [
36+
{
37+
"type": "path",
38+
"data": {
39+
"pathName": "RSC to RW"
40+
}
41+
},
42+
{
43+
"type": "named",
44+
"data": {
45+
"name": "Idle"
46+
}
47+
}
48+
]
2349
}
2450
}
2551
]

‎src/main/deploy/pathplanner/autos/2 Coral - BC.auto‎

Lines changed: 62 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@
55
"data": {
66
"commands": [
77
{
8-
"type": "path",
8+
"type": "parallel",
99
"data": {
10-
"pathName": "BSL to BSC"
10+
"commands": [
11+
{
12+
"type": "path",
13+
"data": {
14+
"pathName": "BSL to BSC"
15+
}
16+
},
17+
{
18+
"type": "named",
19+
"data": {
20+
"name": "Idle"
21+
}
22+
}
23+
]
1124
}
1225
},
1326
{
@@ -17,9 +30,22 @@
1730
}
1831
},
1932
{
20-
"type": "path",
33+
"type": "parallel",
2134
"data": {
22-
"pathName": "BSC to BCS"
35+
"commands": [
36+
{
37+
"type": "path",
38+
"data": {
39+
"pathName": "BSC to BCS"
40+
}
41+
},
42+
{
43+
"type": "named",
44+
"data": {
45+
"name": "Idle"
46+
}
47+
}
48+
]
2349
}
2450
},
2551
{
@@ -29,9 +55,22 @@
2955
}
3056
},
3157
{
32-
"type": "path",
58+
"type": "parallel",
3359
"data": {
34-
"pathName": "BCS to BCC"
60+
"commands": [
61+
{
62+
"type": "path",
63+
"data": {
64+
"pathName": "BCS to BCC"
65+
}
66+
},
67+
{
68+
"type": "named",
69+
"data": {
70+
"name": "Idle"
71+
}
72+
}
73+
]
3574
}
3675
},
3776
{
@@ -41,9 +80,22 @@
4180
}
4281
},
4382
{
44-
"type": "path",
83+
"type": "parallel",
4584
"data": {
46-
"pathName": "BCC to BCS"
85+
"commands": [
86+
{
87+
"type": "path",
88+
"data": {
89+
"pathName": "BCC to BCS"
90+
}
91+
},
92+
{
93+
"type": "named",
94+
"data": {
95+
"name": "Idle"
96+
}
97+
}
98+
]
4799
}
48100
},
49101
{
@@ -53,9 +105,9 @@
53105
}
54106
},
55107
{
56-
"type": "path",
108+
"type": "named",
57109
"data": {
58-
"pathName": "BCS to BW"
110+
"name": "Idle"
59111
}
60112
}
61113
]

‎src/main/deploy/pathplanner/autos/2 Coral - RC .auto‎

Lines changed: 62 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@
55
"data": {
66
"commands": [
77
{
8-
"type": "path",
8+
"type": "parallel",
99
"data": {
10-
"pathName": "RSL to RSC"
10+
"commands": [
11+
{
12+
"type": "path",
13+
"data": {
14+
"pathName": "RSL to RSC"
15+
}
16+
},
17+
{
18+
"type": "named",
19+
"data": {
20+
"name": "Idle"
21+
}
22+
}
23+
]
1124
}
1225
},
1326
{
@@ -17,9 +30,22 @@
1730
}
1831
},
1932
{
20-
"type": "path",
33+
"type": "parallel",
2134
"data": {
22-
"pathName": "RSC to RCS"
35+
"commands": [
36+
{
37+
"type": "path",
38+
"data": {
39+
"pathName": "RSC to RCS"
40+
}
41+
},
42+
{
43+
"type": "named",
44+
"data": {
45+
"name": "Idle"
46+
}
47+
}
48+
]
2349
}
2450
},
2551
{
@@ -29,9 +55,22 @@
2955
}
3056
},
3157
{
32-
"type": "path",
58+
"type": "parallel",
3359
"data": {
34-
"pathName": "RCS to RCC"
60+
"commands": [
61+
{
62+
"type": "path",
63+
"data": {
64+
"pathName": "RCS to RCC"
65+
}
66+
},
67+
{
68+
"type": "named",
69+
"data": {
70+
"name": "Idle"
71+
}
72+
}
73+
]
3574
}
3675
},
3776
{
@@ -41,9 +80,22 @@
4180
}
4281
},
4382
{
44-
"type": "path",
83+
"type": "parallel",
4584
"data": {
46-
"pathName": "RCC to RCS"
85+
"commands": [
86+
{
87+
"type": "path",
88+
"data": {
89+
"pathName": "RCC to RCS"
90+
}
91+
},
92+
{
93+
"type": "named",
94+
"data": {
95+
"name": "Idle"
96+
}
97+
}
98+
]
4799
}
48100
},
49101
{
@@ -53,9 +105,9 @@
53105
}
54106
},
55107
{
56-
"type": "path",
108+
"type": "named",
57109
"data": {
58-
"pathName": "RCS to RW"
110+
"name": "Idle"
59111
}
60112
}
61113
]

0 commit comments

Comments
 (0)