Skip to content

Commit 8fcde4c

Browse files
MichaelLesirgeMichaelLesirge
committed
Merge branch 'main' into addressable-led
2 parents e6fedd3 + 873ff1c commit 8fcde4c

File tree

97 files changed

+1642
-1477
lines changed

Some content is hidden

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

97 files changed

+1642
-1477
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.2.1"
3+
id "edu.wpi.first.GradleRIO" version "2025.3.1"
44
id "com.peterabeles.gversion" version "1.10"
55
id "com.diffplug.spotless" version "6.12.0"
66
}

‎scripts/autosubscoringcmds.py‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import json
2+
import sys
3+
import pathlib
4+
5+
if len(sys.argv) < 2:
6+
raise SystemExit("Usage: python[3] " + sys.argv[0] + " <path to auto file>")
7+
8+
in_path = pathlib.Path(sys.argv[1])
9+
if not in_path.exists():
10+
raise SystemExit("Specified auto file does not exist!")
11+
12+
with open(in_path, "r+") as file:
13+
doc = json.load(file)
14+
auto_cmds = doc["command"]["data"]["commands"]
15+
for cmd in auto_cmds:
16+
if cmd["type"] == "wait":
17+
cmd["type"] = "named"
18+
if cmd["data"]["waitTime"] == 1.5:
19+
cmd["data"]["name"] = "l4"
20+
del cmd["data"]["waitTime"]
21+
elif cmd["data"]["waitTime"] == 2.5:
22+
cmd["data"]["name"] = "intake"
23+
del cmd["data"]["waitTime"]
24+
elif cmd["data"]["waitTime"] == 4.0:
25+
cmd["data"]["name"] = "l4_algae"
26+
del cmd["data"]["waitTime"]
27+
28+
file.seek(0)
29+
file.truncate()
30+
json.dump(doc, file, indent=2)
31+
32+
print("Complete!")

‎scripts/pathsubcorrectrot.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import json
2+
import sys
3+
import pathlib
4+
5+
if len(sys.argv) < 2:
6+
raise SystemExit("Usage: python[3] " + sys.argv[0] + " <path to auto file>")
7+
8+
in_path = pathlib.Path(sys.argv[1])
9+
if not in_path.exists():
10+
raise SystemExit("Specified path file does not exist!")
11+
12+
with open(in_path, "r+") as file:
13+
doc = json.load(file)
14+
rot = doc["idealStartingState"]["rotation"]
15+
rot -= 180
16+
while rot < 0 or rot > 360:
17+
if rot < 0:
18+
rot += 360
19+
else:
20+
rot -= 360
21+
22+
doc["idealStartingState"]["rotation"] = rot
23+
file.seek(0)
24+
file.truncate()
25+
json.dump(doc, file, indent=2)
26+
27+
print("Complete!")

‎src/main/deploy/pathplanner/autos/Inner.auto‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
{
2+
"version": "2025.0",
3+
"command": {
4+
"type": "sequential",
5+
"data": {
6+
"commands": [
7+
{
8+
"type": "path",
9+
"data": {
10+
"pathName": "Low Spawn to D1"
11+
}
12+
},
13+
{
14+
"type": "named",
15+
"data": {
16+
"name": "l4"
17+
}
18+
},
19+
{
20+
"type": "named",
21+
"data": {
22+
"name": "l4"
23+
}
24+
},
25+
{
26+
"type": "named",
27+
"data": {
28+
"name": "stow"
29+
}
30+
},
31+
{
32+
"type": "path",
33+
"data": {
34+
"pathName": "D1 to P1"
35+
}
36+
},
37+
{
38+
"type": "named",
39+
"data": {
40+
"name": "intake"
41+
}
42+
},
43+
{
44+
"type": "named",
45+
"data": {
46+
"name": "intake"
47+
}
48+
},
49+
{
50+
"type": "named",
51+
"data": {
52+
"name": "stow"
53+
}
54+
},
55+
{
56+
"type": "path",
57+
"data": {
58+
"pathName": "P1 to D5"
59+
}
60+
},
61+
{
62+
"type": "named",
63+
"data": {
64+
"name": "l4"
65+
}
66+
},
67+
{
68+
"type": "named",
69+
"data": {
70+
"name": "l4"
71+
}
72+
},
73+
{
74+
"type": "named",
75+
"data": {
76+
"name": "stow"
77+
}
78+
},
79+
{
80+
"type": "path",
81+
"data": {
82+
"pathName": "D5 to P1"
83+
}
84+
},
85+
{
86+
"type": "named",
87+
"data": {
88+
"name": "intake"
89+
}
90+
}
91+
]
92+
}
93+
},
94+
"resetOdom": true,
95+
"folder": "No Algae Clear",
96+
"choreoAuto": false
97+
}

‎src/main/deploy/pathplanner/autos/Low Spawn D1, D5 Double L1 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 1.5
16+
"name": "l4"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 1.5
40+
"name": "l4"
4141
}
4242
},
4343
{

‎src/main/deploy/pathplanner/autos/Low Spawn D2, D4 MonoL3 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 4.0
16+
"name": "l4_algae"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 4.0
40+
"name": "l4_algae"
4141
}
4242
}
4343
]

‎src/main/deploy/pathplanner/autos/Low Spawn D3, D5 Double L1 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 1.5
16+
"name": "l4"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 1.5
40+
"name": "l4"
4141
}
4242
},
4343
{

‎src/main/deploy/pathplanner/autos/Low Spawn D5, D5 P1 Double L1 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 1.5
16+
"name": "l4"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 1.5
40+
"name": "l4"
4141
}
4242
},
4343
{

‎src/main/deploy/pathplanner/autos/Low Spawn D5, D5 P2 Double L1 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 1.5
16+
"name": "l4"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 1.5
40+
"name": "l4"
4141
}
4242
},
4343
{

‎src/main/deploy/pathplanner/autos/Mid Spawn D1, D5 Double L1 Auto.auto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
}
1212
},
1313
{
14-
"type": "wait",
14+
"type": "named",
1515
"data": {
16-
"waitTime": 1.5
16+
"name": "l4"
1717
}
1818
},
1919
{
@@ -23,9 +23,9 @@
2323
}
2424
},
2525
{
26-
"type": "wait",
26+
"type": "named",
2727
"data": {
28-
"waitTime": 2.5
28+
"name": "intake"
2929
}
3030
},
3131
{
@@ -35,9 +35,9 @@
3535
}
3636
},
3737
{
38-
"type": "wait",
38+
"type": "named",
3939
"data": {
40-
"waitTime": 1.5
40+
"name": "l4"
4141
}
4242
},
4343
{

0 commit comments

Comments
 (0)