Skip to content

Commit 53c00a1

Browse files
jonathandao0jonathandao0
committed
Merge remote-tracking branch 'origin/main' into shoot-on-the-move
2 parents 08a9533 + b095b0b commit 53c00a1

42 files changed

Lines changed: 553 additions & 232 deletions

Some content is hidden

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

‎resources/SysIDLogFiles/steertuning2/SysIDLogFiles/steertuning2-14-26.hoot‎

6.7 MB
Binary file not shown.

‎src/main/deploy/ElasticLayouts/placeholderelasticlayoutV1.json‎

Lines changed: 289 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,289 @@
1+
{
2+
"version": 1.0,
3+
"grid_size": 128,
4+
"tabs": [
5+
{
6+
"name": "Teleoperated",
7+
"grid_layout": {
8+
"layouts": [],
9+
"containers": [
10+
{
11+
"title": "IsHubActive",
12+
"x": 384.0,
13+
"y": 128.0,
14+
"width": 256.0,
15+
"height": 256.0,
16+
"type": "Boolean Box",
17+
"properties": {
18+
"topic": "EpilogueTelemetry/m_robotContainer/IsHubActive",
19+
"period": 0.06,
20+
"data_type": "boolean",
21+
"true_color": 4283215696,
22+
"false_color": 4294198070,
23+
"true_icon": "None",
24+
"false_icon": "None"
25+
}
26+
},
27+
{
28+
"title": "Is Pointing at Goal",
29+
"x": 768.0,
30+
"y": 128.0,
31+
"width": 256.0,
32+
"height": 256.0,
33+
"type": "Boolean Box",
34+
"properties": {
35+
"topic": "EpilogueTelemetry/m_robotContainer/Vision/Is Pointing at Goal",
36+
"period": 0.06,
37+
"data_type": "boolean",
38+
"true_color": 4283215696,
39+
"false_color": 4294198070,
40+
"true_icon": "None",
41+
"false_icon": "None"
42+
}
43+
},
44+
{
45+
"title": "ResetGyro",
46+
"x": 384.0,
47+
"y": 384.0,
48+
"width": 640.0,
49+
"height": 128.0,
50+
"type": "Command",
51+
"properties": {
52+
"topic": "/SmartDashboard/ResetGyro",
53+
"period": 0.06,
54+
"show_type": true,
55+
"maximize_button_space": false
56+
}
57+
},
58+
{
59+
"title": "limelight-left UpdatedRejected",
60+
"x": 384.0,
61+
"y": 512.0,
62+
"width": 256.0,
63+
"height": 128.0,
64+
"type": "Boolean Box",
65+
"properties": {
66+
"topic": "/SmartDashboard/limelight-left UpdatedRejected",
67+
"period": 0.06,
68+
"data_type": "boolean",
69+
"true_color": 4283215696,
70+
"false_color": 4294198070,
71+
"true_icon": "None",
72+
"false_icon": "None"
73+
}
74+
},
75+
{
76+
"title": "limelight-right UpdatedRejected",
77+
"x": 768.0,
78+
"y": 512.0,
79+
"width": 256.0,
80+
"height": 128.0,
81+
"type": "Boolean Box",
82+
"properties": {
83+
"topic": "/SmartDashboard/limelight-right UpdatedRejected",
84+
"period": 0.06,
85+
"data_type": "boolean",
86+
"true_color": 4283215696,
87+
"false_color": 4294198070,
88+
"true_icon": "None",
89+
"false_icon": "None"
90+
}
91+
},
92+
{
93+
"title": "Auto Side",
94+
"x": 384.0,
95+
"y": 0.0,
96+
"width": 256.0,
97+
"height": 128.0,
98+
"type": "ComboBox Chooser",
99+
"properties": {
100+
"topic": "/SmartDashboard/Auto Side",
101+
"period": 0.06,
102+
"sort_options": false
103+
}
104+
},
105+
{
106+
"title": "kPAutoAlign",
107+
"x": 0.0,
108+
"y": 128.0,
109+
"width": 128.0,
110+
"height": 128.0,
111+
"type": "Text Display",
112+
"properties": {
113+
"topic": "/SmartDashboard/kPAutoAlign",
114+
"period": 0.06,
115+
"data_type": "double",
116+
"show_submit_button": false
117+
}
118+
},
119+
{
120+
"title": "kDAutoAlign",
121+
"x": 128.0,
122+
"y": 128.0,
123+
"width": 128.0,
124+
"height": 128.0,
125+
"type": "Text Display",
126+
"properties": {
127+
"topic": "/SmartDashboard/kDAutoAlign",
128+
"period": 0.06,
129+
"data_type": "double",
130+
"show_submit_button": false
131+
}
132+
},
133+
{
134+
"title": "ShooterRPMSetpoint",
135+
"x": 0.0,
136+
"y": 256.0,
137+
"width": 256.0,
138+
"height": 128.0,
139+
"type": "Text Display",
140+
"properties": {
141+
"topic": "/SmartDashboard/ShooterRPMSetpoint",
142+
"period": 0.06,
143+
"data_type": "double",
144+
"show_submit_button": false
145+
}
146+
},
147+
{
148+
"title": "Uptake RPM Setpoint",
149+
"x": 0.0,
150+
"y": 384.0,
151+
"width": 256.0,
152+
"height": 128.0,
153+
"type": "Text Display",
154+
"properties": {
155+
"topic": "/SmartDashboard/Uptake RPM Setpoint",
156+
"period": 0.06,
157+
"data_type": "double",
158+
"show_submit_button": false
159+
}
160+
},
161+
{
162+
"title": "AutoChooser",
163+
"x": 768.0,
164+
"y": 0.0,
165+
"width": 256.0,
166+
"height": 128.0,
167+
"type": "ComboBox Chooser",
168+
"properties": {
169+
"topic": "EpilogueTelemetry/m_robotContainer/AutoChooser",
170+
"period": 0.06,
171+
"sort_options": false
172+
}
173+
},
174+
{
175+
"title": "At Setpoint",
176+
"x": 1152.0,
177+
"y": 0.0,
178+
"width": 256.0,
179+
"height": 128.0,
180+
"type": "Boolean Box",
181+
"properties": {
182+
"topic": "EpilogueTelemetry/m_robotContainer/Hood/At Setpoint",
183+
"period": 0.06,
184+
"data_type": "boolean",
185+
"true_color": 4283215696,
186+
"false_color": 4294198070,
187+
"true_icon": "None",
188+
"false_icon": "None"
189+
}
190+
},
191+
{
192+
"title": "RPM error",
193+
"x": 1280.0,
194+
"y": 128.0,
195+
"width": 128.0,
196+
"height": 128.0,
197+
"type": "Text Display",
198+
"properties": {
199+
"topic": "EpilogueTelemetry/m_robotContainer/Flywheel/RPM error",
200+
"period": 0.06,
201+
"data_type": "double",
202+
"show_submit_button": false
203+
}
204+
},
205+
{
206+
"title": "RPM Setpoint",
207+
"x": 1152.0,
208+
"y": 128.0,
209+
"width": 128.0,
210+
"height": 128.0,
211+
"type": "Text Display",
212+
"properties": {
213+
"topic": "EpilogueTelemetry/m_robotContainer/Flywheel/RPM Setpoint",
214+
"period": 0.06,
215+
"data_type": "double",
216+
"show_submit_button": false
217+
}
218+
},
219+
{
220+
"title": "At Setpoint",
221+
"x": 1152.0,
222+
"y": 512.0,
223+
"width": 256.0,
224+
"height": 128.0,
225+
"type": "Boolean Box",
226+
"properties": {
227+
"topic": "EpilogueTelemetry/m_robotContainer/IntakePivot/At Setpoint",
228+
"period": 0.06,
229+
"data_type": "boolean",
230+
"true_color": 4283215696,
231+
"false_color": 4294198070,
232+
"true_icon": "None",
233+
"false_icon": "None"
234+
}
235+
},
236+
{
237+
"title": "Pivot Angle Degrees",
238+
"x": 1152.0,
239+
"y": 384.0,
240+
"width": 128.0,
241+
"height": 128.0,
242+
"type": "Text Display",
243+
"properties": {
244+
"topic": "EpilogueTelemetry/m_robotContainer/IntakePivot/Pivot Angle Degrees",
245+
"period": 0.06,
246+
"data_type": "double",
247+
"show_submit_button": false
248+
}
249+
},
250+
{
251+
"title": "Pivot Setpoint",
252+
"x": 1280.0,
253+
"y": 384.0,
254+
"width": 128.0,
255+
"height": 128.0,
256+
"type": "Text Display",
257+
"properties": {
258+
"topic": "EpilogueTelemetry/m_robotContainer/IntakePivot/Pivot Setpoint",
259+
"period": 0.06,
260+
"data_type": "double",
261+
"show_submit_button": false
262+
}
263+
},
264+
{
265+
"title": "Distance to Hub",
266+
"x": 1152.0,
267+
"y": 640.0,
268+
"width": 256.0,
269+
"height": 128.0,
270+
"type": "Text Display",
271+
"properties": {
272+
"topic": "EpilogueTelemetry/m_robotContainer/Vision/Distance to Hub",
273+
"period": 0.06,
274+
"data_type": "double",
275+
"show_submit_button": false
276+
}
277+
}
278+
]
279+
}
280+
},
281+
{
282+
"name": "Autonomous",
283+
"grid_layout": {
284+
"layouts": [],
285+
"containers": []
286+
}
287+
}
288+
]
289+
}

src/main/deploy/pathplanner/autos/PreloadDepotShootCenter.auto renamed to src/main/deploy/pathplanner/autos/CenterDepot.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": "PreloadDepotShootCenter1"
10+
"pathName": "CenterDepot1"
1111
}
1212
},
1313
{
1414
"type": "path",
1515
"data": {
16-
"pathName": "PreloadDepotShootCenter2"
16+
"pathName": "CenterDepot2"
1717
}
1818
},
1919
{
2020
"type": "path",
2121
"data": {
22-
"pathName": "PreloadDepotShootCenter3"
22+
"pathName": "CenterDepot3"
2323
}
2424
}
2525
]

src/main/deploy/pathplanner/autos/PreloadCenter.auto renamed to src/main/deploy/pathplanner/autos/CenterPreloadOnly.auto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"type": "path",
99
"data": {
10-
"pathName": "PreloadCenter1"
10+
"pathName": "CenterPreloadOnly1"
1111
}
1212
}
1313
]

src/main/deploy/pathplanner/autos/PreloadNeutralShootClimb.auto renamed to src/main/deploy/pathplanner/autos/SideNeutralClimb.auto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
{
88
"type": "path",
99
"data": {
10-
"pathName": "PreloadNeutralShootClimb1"
10+
"pathName": "SideNeutralClimb1"
1111
}
1212
},
1313
{
1414
"type": "path",
1515
"data": {
16-
"pathName": "PreloadNeutralShootClimb2"
16+
"pathName": "SideNeutralClimb2"
1717
}
1818
},
1919
{
2020
"type": "path",
2121
"data": {
22-
"pathName": "PreloadNeutralShootClimb3"
22+
"pathName": "SideNeutralClimb3"
2323
}
2424
},
2525
{
2626
"type": "path",
2727
"data": {
28-
"pathName": "PreloadNeutralShootClimb4"
28+
"pathName": "SideNeutralClimb4"
2929
}
3030
},
3131
{
3232
"type": "path",
3333
"data": {
34-
"pathName": "PreloadNeutralShootClimb5Depot"
34+
"pathName": "SideNeutralClimb5Depot"
3535
}
3636
}
3737
]

0 commit comments

Comments
 (0)