Skip to content

Commit 4e82f49

Browse files
authored
Merge pull request #27 from IgniteRobotics/states-hotfixes
Merge States hotfixes to main
2 parents 76358c4 + f2ca3e1 commit 4e82f49

11 files changed

Lines changed: 325 additions & 246 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
X,Y,Tangent X,Tangent Y,Fixed Theta,Reversed,Name
22
5.058,-6.372599999999999,-0.885,-0.035,true,false,
33
1.9146454668594457,-5.907394881363669,-0.7567336701925271,0.046568225858001355,true,false,
4-
0.8435762721254075,-6.582634156304694,-0.6519551620120235,-0.53553459736702,true,false,
4+
1.0182071190929143,-6.419645365801688,-0.5937448796895217,-0.5704607667605206,true,false,

shuffleboard.json

Lines changed: 96 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -186,54 +186,6 @@
186186
]
187187
}
188188
},
189-
"0,4": {
190-
"size": [
191-
2,
192-
4
193-
],
194-
"content": {
195-
"_type": "List Layout",
196-
"_title": "LIMELIGHT",
197-
"Layout/Label position": "BOTTOM",
198-
"_children": [
199-
{
200-
"_type": "Boolean Box",
201-
"_source0": "network_table:///SmartDashboard/Limelight tv",
202-
"_title": "TARGET FOUND",
203-
"Colors/Color when true": "#7CFC00FF",
204-
"Colors/Color when false": "#8B0000FF"
205-
},
206-
{
207-
"_type": "Text View",
208-
"_source0": "network_table:///SmartDashboard/Limelight distance",
209-
"_title": "DISTANCE"
210-
},
211-
{
212-
"_type": "Text View",
213-
"_source0": "network_table:///SmartDashboard/Limelight tx",
214-
"_title": "TX"
215-
},
216-
{
217-
"_type": "Text View",
218-
"_source0": "network_table:///SmartDashboard/Limelight ty",
219-
"_title": "TY"
220-
},
221-
{
222-
"_type": "Camera Stream",
223-
"_source0": "camera_server://USB Camera 0",
224-
"_title": "USB Camera 0",
225-
"Crosshair/Show crosshair": true,
226-
"Crosshair/Crosshair color": "#FFFFFFFF",
227-
"Controls/Show controls": true,
228-
"Controls/Rotation": "NONE",
229-
"compression": -1.0,
230-
"fps": -1,
231-
"imageWidth": 0,
232-
"imageHeight": 0
233-
}
234-
]
235-
}
236-
},
237189
"10,4": {
238190
"size": [
239191
2,
@@ -517,6 +469,17 @@
517469
"_source0": "network_table:///Preferences/Hood Set Position",
518470
"_title": "Preferences/Hood Set Position"
519471
}
472+
},
473+
"4,1": {
474+
"size": [
475+
1,
476+
1
477+
],
478+
"content": {
479+
"_type": "Text View",
480+
"_source0": "network_table:///Preferences/Passive shooter velocity",
481+
"_title": "Preferences/Passive shooter velocity"
482+
}
520483
}
521484
}
522485
}
@@ -564,12 +527,93 @@
564527
}
565528
}
566529
}
530+
},
531+
{
532+
"title": "Limelight",
533+
"autoPopulate": false,
534+
"autoPopulatePrefix": "",
535+
"widgetPane": {
536+
"gridSize": 128.0,
537+
"showGrid": true,
538+
"hgap": 16.0,
539+
"vgap": 16.0,
540+
"titleType": 0,
541+
"tiles": {
542+
"4,0": {
543+
"size": [
544+
1,
545+
1
546+
],
547+
"content": {
548+
"_type": "Boolean Box",
549+
"_source0": "network_table:///SmartDashboard/Limelight Stable",
550+
"_title": "SmartDashboard/Limelight Stable",
551+
"Colors/Color when true": "#7CFC00FF",
552+
"Colors/Color when false": "#8B0000FF"
553+
}
554+
},
555+
"6,0": {
556+
"size": [
557+
2,
558+
3
559+
],
560+
"content": {
561+
"_type": "List Layout",
562+
"_title": "LIMELIGHT",
563+
"Layout/Label position": "BOTTOM",
564+
"_children": [
565+
{
566+
"_type": "Boolean Box",
567+
"_source0": "network_table:///SmartDashboard/Limelight tv",
568+
"_title": "TARGET FOUND",
569+
"Colors/Color when true": "#7CFC00FF",
570+
"Colors/Color when false": "#8B0000FF"
571+
},
572+
{
573+
"_type": "Text View",
574+
"_source0": "network_table:///SmartDashboard/Limelight distance",
575+
"_title": "DISTANCE"
576+
},
577+
{
578+
"_type": "Text View",
579+
"_source0": "network_table:///SmartDashboard/Limelight tx",
580+
"_title": "TX"
581+
},
582+
{
583+
"_type": "Text View",
584+
"_source0": "network_table:///SmartDashboard/Limelight ty",
585+
"_title": "TY"
586+
}
587+
]
588+
}
589+
},
590+
"0,0": {
591+
"size": [
592+
4,
593+
4
594+
],
595+
"content": {
596+
"_type": "Camera Stream",
597+
"_source0": "camera_server://limelight",
598+
"_title": "limelight",
599+
"Crosshair/Show crosshair": true,
600+
"Crosshair/Crosshair color": "#FFFFFFFF",
601+
"Controls/Show controls": true,
602+
"Controls/Rotation": "NONE",
603+
"compression": -1.0,
604+
"fps": -1,
605+
"imageWidth": -1,
606+
"imageHeight": -1
607+
}
608+
}
609+
}
610+
}
567611
}
568612
],
569613
"windowGeometry": {
570-
"x": -6.666666507720947,
571-
"y": 0.0,
572-
"width": 1293.3333740234375,
573-
"height": 766.6666870117188
614+
"x": -7.333333492279053,
615+
"y": -7.333333492279053,
616+
"width": 1294.6666259765625,
617+
"height": 774.6666870117188
574618
}
575619
}

0 commit comments

Comments
 (0)