Skip to content

Commit 6dedcfb

Browse files
AkeBoss-techAkeBoss-tech
authored
Merge pull request #34 from FRC1257/AutoDev
merge Auto dev into master
2 parents e45f069 + 04d8430 commit 6dedcfb

File tree

83 files changed

+1541
-583
lines changed

Some content is hidden

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

83 files changed

+1541
-583
lines changed

‎.pathplanner/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"4 Note Auto (Bottom)",
99
"4 Note Auto (Mid)",
1010
"4 Note Auto (Top)",
11-
"New Folder"
11+
"disruptors"
1212
],
1313
"autoFolders": [],
1414
"defaultMaxVel": 3.0,

‎sim_logs/.Log_24-03-22_11-14-32.wpilog.icloud

-180 Bytes
Binary file not shown.

‎sim_logs/.Log_24-03-22_11-16-19.wpilog.icloud

-180 Bytes
Binary file not shown.

‎sim_logs/.Log_24-03-22_11-18-43.wpilog.icloud

-180 Bytes
Binary file not shown.

‎sim_logs/Log_177dd034386b90b9.wpilog

-87 Bytes
Binary file not shown.

‎sim_logs/Log_24-03-22_11-06-26.wpilog

-915 KB
Binary file not shown.

‎sim_logs/Log_24-03-22_11-22-21.wpilog

-811 KB
Binary file not shown.

‎sim_logs/Log_24-03-22_11-23-07.wpilog

-27 MB
Binary file not shown.

‎sim_logs/Log_24-03-22_12-07-00.wpilog

-170 KB
Binary file not shown.

‎sim_logs/Log_24-03-22_12-07-29.wpilog

-4.36 MB
Binary file not shown.

‎sim_logs/Log_24-03-24_23-04-25.wpilog

-605 KB
Binary file not shown.

‎sim_logs/Log_24-03-26_16-40-15.wpilog

-6.06 MB
Binary file not shown.

‎sim_logs/Log_24-03-26_16-53-41.wpilog

-10.7 MB
Binary file not shown.

‎sim_logs/Log_24-03-26_17-02-18.wpilog

-2.33 MB
Binary file not shown.

‎sim_logs/Log_24-03-26_17-03-13.wpilog

-2.77 MB
Binary file not shown.

‎sim_logs/Log_24-03-26_17-04-32.wpilog

-530 KB
Binary file not shown.

‎sim_logs/Log_24-03-26_17-06-37.wpilog

-1.24 MB
Binary file not shown.

‎sim_logs/Log_24-03-26_17-08-13.wpilog

-177 KB
Binary file not shown.

‎sim_logs/Log_3d6856de97fcdd78.wpilog

-87 Bytes
Binary file not shown.

‎sim_logs/Log_83507f982185395e.wpilog

-87 Bytes
Binary file not shown.

‎sim_logs/Log_91d5eeb224f9d4f0.wpilog

-87 Bytes
Binary file not shown.

‎sim_logs/Log_940c1027443a1052.wpilog

-87 Bytes
Binary file not shown.

‎sim_logs/Log_b794d6b437744c25.wpilog

-87 Bytes
Binary file not shown.

‎simgui.json

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"/SmartDashboard/Arm Mechanism": "Mechanism2d",
2222
"/SmartDashboard/Auto Choices": "String Chooser",
2323
"/SmartDashboard/Claw": "Subsystem",
24+
"/SmartDashboard/Deadzone": "String Chooser",
2425
"/SmartDashboard/Drive": "Subsystem",
2526
"/SmartDashboard/Elevator": "Subsystem",
2627
"/SmartDashboard/Field": "Field2d",
@@ -36,6 +37,7 @@
3637
"/SmartDashboard/NoteTwo": "String Chooser",
3738
"/SmartDashboard/NoteTwoShot": "String Chooser",
3839
"/SmartDashboard/Pathfind to Pickup Pos": "Command",
40+
"/SmartDashboard/Pivot Sysid": "Command",
3941
"/SmartDashboard/PivotArm": "Subsystem",
4042
"/SmartDashboard/Start": "String Chooser",
4143
"/SmartDashboard/Sysid Dynamic Drive Backward": "Command",
@@ -78,6 +80,11 @@
7880
"window": {
7981
"visible": true
8082
}
83+
},
84+
"/SmartDashboard/Pivot Sysid": {
85+
"window": {
86+
"visible": true
87+
}
8188
}
8289
}
8390
},

‎src/main/deploy/pathplanner/autos/Passing top.auto

+181
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.73,
6+
"y": 6.71
7+
},
8+
"rotation": 60.0
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "ShootSide"
18+
}
19+
},
20+
{
21+
"type": "parallel",
22+
"data": {
23+
"commands": [
24+
{
25+
"type": "path",
26+
"data": {
27+
"pathName": "s1-n4"
28+
}
29+
},
30+
{
31+
"type": "named",
32+
"data": {
33+
"name": "IntakeWhile"
34+
}
35+
},
36+
{
37+
"type": "named",
38+
"data": {
39+
"name": "ZeroPivot"
40+
}
41+
}
42+
]
43+
}
44+
},
45+
{
46+
"type": "deadline",
47+
"data": {
48+
"commands": [
49+
{
50+
"type": "path",
51+
"data": {
52+
"pathName": "n4-p4"
53+
}
54+
},
55+
{
56+
"type": "named",
57+
"data": {
58+
"name": "PrepPass"
59+
}
60+
}
61+
]
62+
}
63+
},
64+
{
65+
"type": "named",
66+
"data": {
67+
"name": "Pass"
68+
}
69+
},
70+
{
71+
"type": "parallel",
72+
"data": {
73+
"commands": [
74+
{
75+
"type": "path",
76+
"data": {
77+
"pathName": "p4-n5"
78+
}
79+
},
80+
{
81+
"type": "named",
82+
"data": {
83+
"name": "IntakeWhile"
84+
}
85+
},
86+
{
87+
"type": "named",
88+
"data": {
89+
"name": "ZeroPivot"
90+
}
91+
}
92+
]
93+
}
94+
},
95+
{
96+
"type": "deadline",
97+
"data": {
98+
"commands": [
99+
{
100+
"type": "path",
101+
"data": {
102+
"pathName": "n5-p5"
103+
}
104+
},
105+
{
106+
"type": "named",
107+
"data": {
108+
"name": "PrepPass"
109+
}
110+
}
111+
]
112+
}
113+
},
114+
{
115+
"type": "named",
116+
"data": {
117+
"name": "Pass"
118+
}
119+
},
120+
{
121+
"type": "parallel",
122+
"data": {
123+
"commands": [
124+
{
125+
"type": "path",
126+
"data": {
127+
"pathName": "p5-n6"
128+
}
129+
},
130+
{
131+
"type": "named",
132+
"data": {
133+
"name": "IntakeWhile"
134+
}
135+
},
136+
{
137+
"type": "named",
138+
"data": {
139+
"name": "ZeroPivot"
140+
}
141+
}
142+
]
143+
}
144+
},
145+
{
146+
"type": "deadline",
147+
"data": {
148+
"commands": [
149+
{
150+
"type": "path",
151+
"data": {
152+
"pathName": "n6-p5"
153+
}
154+
},
155+
{
156+
"type": "named",
157+
"data": {
158+
"name": "PrepPass"
159+
}
160+
}
161+
]
162+
}
163+
},
164+
{
165+
"type": "named",
166+
"data": {
167+
"name": "Pass"
168+
}
169+
},
170+
{
171+
"type": "named",
172+
"data": {
173+
"name": "ZeroPivot"
174+
}
175+
}
176+
]
177+
}
178+
},
179+
"folder": null,
180+
"choreoAuto": false
181+
}

‎src/main/deploy/pathplanner/autos/disruptor bottom.auto

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.8221644973960404,
6+
"y": 4.438407050851191
7+
},
8+
"rotation": -59.953166735835815
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "ShootSide"
18+
}
19+
},
20+
{
21+
"type": "path",
22+
"data": {
23+
"pathName": "disruptor"
24+
}
25+
}
26+
]
27+
}
28+
},
29+
"folder": null,
30+
"choreoAuto": false
31+
}

‎src/main/deploy/pathplanner/autos/disruptor through center.auto

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"version": 1.0,
3+
"startingPose": {
4+
"position": {
5+
"x": 0.7987428243044774,
6+
"y": 4.461828723942754
7+
},
8+
"rotation": -62.98733465206146
9+
},
10+
"command": {
11+
"type": "sequential",
12+
"data": {
13+
"commands": [
14+
{
15+
"type": "named",
16+
"data": {
17+
"name": "ShootSide"
18+
}
19+
},
20+
{
21+
"type": "path",
22+
"data": {
23+
"pathName": "disruptor top"
24+
}
25+
}
26+
]
27+
}
28+
},
29+
"folder": null,
30+
"choreoAuto": false
31+
}

‎src/main/deploy/pathplanner/navgrid.json

+1-1
Large diffs are not rendered by default.

‎src/main/deploy/pathplanner/paths/disruptor top.path

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"version": 1.0,
3+
"waypoints": [
4+
{
5+
"anchor": {
6+
"x": 0.7987428243044774,
7+
"y": 4.461828723942754
8+
},
9+
"prevControl": null,
10+
"nextControl": {
11+
"x": 1.798742824304477,
12+
"y": 4.461828723942754
13+
},
14+
"isLocked": false,
15+
"linkedName": null
16+
},
17+
{
18+
"anchor": {
19+
"x": 4.218307095672678,
20+
"y": 3.1970583769983514
21+
},
22+
"prevControl": {
23+
"x": 2.4938603351777973,
24+
"y": 1.9419876578216035
25+
},
26+
"nextControl": {
27+
"x": 6.197438471909753,
28+
"y": 4.637491272129477
29+
},
30+
"isLocked": false,
31+
"linkedName": null
32+
},
33+
{
34+
"anchor": {
35+
"x": 8.551316617611835,
36+
"y": 7.330983677659224
37+
},
38+
"prevControl": {
39+
"x": 6.530017592955518,
40+
"y": 4.231658506519531
41+
},
42+
"nextControl": {
43+
"x": 8.726979165798557,
44+
"y": 7.600332918212198
45+
},
46+
"isLocked": false,
47+
"linkedName": null
48+
},
49+
{
50+
"anchor": {
51+
"x": 8.680135819615433,
52+
"y": 0.7963368851131419
53+
},
54+
"prevControl": {
55+
"x": 8.551316617611835,
56+
"y": 5.609490705429343
57+
},
58+
"nextControl": null,
59+
"isLocked": false,
60+
"linkedName": null
61+
}
62+
],
63+
"rotationTargets": [
64+
{
65+
"waypointRelativePos": 2.05,
66+
"rotationDegrees": 132.0312887717349,
67+
"rotateFast": false
68+
},
69+
{
70+
"waypointRelativePos": 2.4000000000000004,
71+
"rotationDegrees": 137.97714319292345,
72+
"rotateFast": false
73+
},
74+
{
75+
"waypointRelativePos": 2.65,
76+
"rotationDegrees": 47.819532341859365,
77+
"rotateFast": true
78+
},
79+
{
80+
"waypointRelativePos": 2.8499999999999996,
81+
"rotationDegrees": 104.9999330733895,
82+
"rotateFast": true
83+
}
84+
],
85+
"constraintZones": [],
86+
"eventMarkers": [],
87+
"globalConstraints": {
88+
"maxVelocity": 3.0,
89+
"maxAcceleration": 3.0,
90+
"maxAngularVelocity": 600.0,
91+
"maxAngularAcceleration": 800.0
92+
},
93+
"goalEndState": {
94+
"velocity": 0,
95+
"rotation": 135.0000000000001,
96+
"rotateFast": false
97+
},
98+
"reversed": false,
99+
"folder": "disruptors",
100+
"previewStartingState": {
101+
"rotation": -59.32271997820354,
102+
"velocity": 0
103+
},
104+
"useDefaultConstraints": false
105+
}

0 commit comments

Comments
 (0)