Skip to content

Commit 6f676c5

Browse files
Nathanael7639Nathanael7639
committed
Merge remote-tracking branch 'origin/code-cleanup' into shoot-on-the-move
2 parents ac327ac + 6247863 commit 6f676c5

56 files changed

Lines changed: 1133 additions & 1098 deletions

Some content is hidden

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

‎resources/Robot_4201_1_28/config.json‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎resources/Robot_Threepeater_v1/config.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"name": "Threepeater v1",
3+
"isFTC": false,
4+
"rotations": [
5+
{
6+
"axis": "x",
7+
"degrees": 90
8+
},
9+
{
10+
"axis": "z",
11+
"degrees": 90
12+
}
13+
],
14+
"position": [
15+
0,
16+
0,
17+
0
18+
],
19+
"cameras": [],
20+
"components": [
21+
{
22+
"zeroedRotations": [
23+
{
24+
"axis": "x",
25+
"degrees": 90
26+
},
27+
{
28+
"axis": "z",
29+
"degrees": 90
30+
}
31+
],
32+
"zeroedPosition": [
33+
-0.06,
34+
0,
35+
-0.13
36+
]
37+
},
38+
{
39+
"zeroedRotations": [
40+
{
41+
"axis": "x",
42+
"degrees": 90
43+
},
44+
{
45+
"axis": "z",
46+
"degrees": 90
47+
}
48+
],
49+
"zeroedPosition": [
50+
-0.3048,
51+
0,
52+
0
53+
]
54+
}
55+
]
56+
}

resources/Robot_4201_1_28/model.glb renamed to resources/Robot_Threepeater_v1/model.glb

31.6 MB
Binary file not shown.

‎resources/Robot_Threepeater_v1/model_0.glb‎

3.82 MB
Binary file not shown.

‎resources/Robot_Threepeater_v1/model_1.glb‎

2.22 MB
Binary file not shown.

‎resources/cad-1-24.png‎

-216 KB
Binary file not shown.

src/main/deploy/pathplanner/autos/PreloadDepotShootMiddle.auto renamed to src/main/deploy/pathplanner/autos/PreloadDepotShootCenter.auto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
{
88
"type": "path",
99
"data": {
10-
"pathName": "PreloadDepotShootMiddle1"
10+
"pathName": "PreloadDepotShootCenter1"
1111
}
1212
},
1313
{
1414
"type": "path",
1515
"data": {
16-
"pathName": "PreloadDepotShootMiddle2"
16+
"pathName": "PreloadDepotShootCenter2"
1717
}
1818
},
1919
{
2020
"type": "path",
2121
"data": {
22-
"pathName": "PreloadDepotShootMiddle3"
22+
"pathName": "PreloadDepotShootCenter3"
2323
}
2424
}
2525
]

src/main/deploy/pathplanner/paths/PreloadDepotShootMiddle1.path renamed to src/main/deploy/pathplanner/paths/PreloadDepotShootCenter1.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"rotation": 0.0
4646
},
4747
"reversed": false,
48-
"folder": "PreloadDepotShootMiddle",
48+
"folder": "PreloadDepotShootCenter",
4949
"idealStartingState": {
5050
"velocity": 0,
5151
"rotation": 0.0

src/main/deploy/pathplanner/paths/PreloadDepotShootMiddle2.path renamed to src/main/deploy/pathplanner/paths/PreloadDepotShootCenter2.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"rotation": 180.0
4646
},
4747
"reversed": false,
48-
"folder": "PreloadDepotShootMiddle",
48+
"folder": "PreloadDepotShootCenter",
4949
"idealStartingState": {
5050
"velocity": 0,
5151
"rotation": 0.0

src/main/deploy/pathplanner/paths/PreloadDepotShootMiddle3.path renamed to src/main/deploy/pathplanner/paths/PreloadDepotShootCenter3.path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"rotation": 0.0
4646
},
4747
"reversed": false,
48-
"folder": "PreloadDepotShootMiddle",
48+
"folder": "PreloadDepotShootCenter",
4949
"idealStartingState": {
5050
"velocity": 0,
5151
"rotation": 180.0

0 commit comments

Comments
 (0)