Skip to content

Commit 18a691d

Browse files
committed
Merge branch 'note-filtering' into marc
2 parents d760ea3 + d321e3f commit 18a691d

20 files changed

Lines changed: 309 additions & 104 deletions

src/main/deploy/pathplanner/autos/$a!p-b1-c1-c2.auto

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"pathName": "get the note"
3030
}
3131
},
32+
{
33+
"type": "named",
34+
"data": {
35+
"name": "B1"
36+
}
37+
},
3238
{
3339
"type": "named",
3440
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$apb1c(12)!score b1 c1"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C1"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {
@@ -83,6 +95,12 @@
8395
"pathName": "$apb1c(12)!c2"
8496
}
8597
},
98+
{
99+
"type": "named",
100+
"data": {
101+
"name": "C2"
102+
}
103+
},
86104
{
87105
"type": "named",
88106
"data": {

src/main/deploy/pathplanner/autos/$a!p-b1-c2-c3.auto

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"pathName": "get the note"
3030
}
3131
},
32+
{
33+
"type": "named",
34+
"data": {
35+
"name": "B1"
36+
}
37+
},
3238
{
3339
"type": "named",
3440
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$apb1c(23)!c2"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C2"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {
@@ -83,6 +95,12 @@
8395
"pathName": "$apb1c(23)!c3"
8496
}
8597
},
98+
{
99+
"type": "named",
100+
"data": {
101+
"name": "C3"
102+
}
103+
},
86104
{
87105
"type": "named",
88106
"data": {

src/main/deploy/pathplanner/autos/$c!p-b2-c3.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"type": "sequential",
1212
"data": {
1313
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "B2"
18+
}
19+
},
1420
{
1521
"type": "sequential",
1622
"data": {
@@ -78,6 +84,12 @@
7884
"pathName": "$cpb2c3!c3"
7985
}
8086
},
87+
{
88+
"type": "named",
89+
"data": {
90+
"name": "C3"
91+
}
92+
},
8193
{
8294
"type": "named",
8395
"data": {

src/main/deploy/pathplanner/autos/$c!p-b3-b2-b1.auto

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
"pathName": "$cpb(321)!b3"
4949
}
5050
},
51+
{
52+
"type": "named",
53+
"data": {
54+
"name": "B3"
55+
}
56+
},
5157
{
5258
"type": "named",
5359
"data": {
@@ -72,6 +78,12 @@
7278
"waitTime": 0.3
7379
}
7480
},
81+
{
82+
"type": "named",
83+
"data": {
84+
"name": "B2"
85+
}
86+
},
7587
{
7688
"type": "named",
7789
"data": {
@@ -90,6 +102,12 @@
90102
"pathName": "$cpb(321)!b1"
91103
}
92104
},
105+
{
106+
"type": "named",
107+
"data": {
108+
"name": "B1"
109+
}
110+
},
93111
{
94112
"type": "named",
95113
"data": {
@@ -114,6 +132,12 @@
114132
"pathName": "gasgas"
115133
}
116134
},
135+
{
136+
"type": "named",
137+
"data": {
138+
"name": "C1"
139+
}
140+
},
117141
{
118142
"type": "named",
119143
"data": {

src/main/deploy/pathplanner/autos/$s!p-c3-c4.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$spc(34)!p-c3"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C3"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$spc(34)!c4"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C4"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

src/main/deploy/pathplanner/autos/$s!p-c3-c5.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$spc(35)!p-c3"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C3"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$spc(35)!c5"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C5"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

src/main/deploy/pathplanner/autos/$s!p-c4-c3.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$spc(43)!p-c4"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C4"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$spc(43)!c3"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C3"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

src/main/deploy/pathplanner/autos/$s!p-c4-c5.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$spc(45)!p-c4"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C4"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$spc(45)!c5"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C5"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

src/main/deploy/pathplanner/autos/$s!p-c5-c3.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$spc(53)!p-c5"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C5"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$spc(53)!c3"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C3"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

src/main/deploy/pathplanner/autos/$s!p-c5-c4.auto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"pathName": "$s!p-c5"
2424
}
2525
},
26+
{
27+
"type": "named",
28+
"data": {
29+
"name": "C5"
30+
}
31+
},
2632
{
2733
"type": "named",
2834
"data": {
@@ -53,6 +59,12 @@
5359
"pathName": "$s!c4"
5460
}
5561
},
62+
{
63+
"type": "named",
64+
"data": {
65+
"name": "C4"
66+
}
67+
},
5668
{
5769
"type": "named",
5870
"data": {

0 commit comments

Comments
 (0)