From 3cb1d085622af52bf2047bae088d66333b3fc76a Mon Sep 17 00:00:00 2001 From: Joseph Kantrowitz Date: Sat, 1 Mar 2025 15:21:44 -0500 Subject: [PATCH 1/4] added temporary driveteam elastic - we need CAMERAS and AUTOCHOOSER --- ...iver-layout-temp_needCAMERASandAUTOCHOOSER | 441 ++++++++++++++++++ 1 file changed, 441 insertions(+) create mode 100644 elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER diff --git a/elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER b/elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER new file mode 100644 index 00000000..fdf060a4 --- /dev/null +++ b/elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER @@ -0,0 +1,441 @@ +{ + "version": 1.0, + "grid_size": 128, + "tabs": [ + { + "name": "Teleoperated", + "grid_layout": { + "layouts": [], + "containers": [ + { + "title": "Field", + "x": 0.0, + "y": 128.0, + "width": 896.0, + "height": 384.0, + "type": "Field", + "properties": { + "topic": "/SmartDashboard/Field", + "period": 0.06, + "field_game": "Reefscape", + "robot_width": 0.85, + "robot_length": 0.85, + "show_other_objects": true, + "show_trajectories": true, + "field_rotation": 0.0, + "robot_color": 4294198070, + "trajectory_color": 4294967295 + } + }, + { + "title": "EventName", + "x": 512.0, + "y": 0.0, + "width": 256.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/FMSInfo/EventName", + "period": 0.06, + "data_type": "string" + } + }, + { + "title": "IsRedAlliance", + "x": 512.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/FMSInfo/IsRedAlliance", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "MatchNumber", + "x": 0.0, + "y": 0.0, + "width": 256.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/FMSInfo/MatchNumber", + "period": 0.06, + "data_type": "int" + } + }, + { + "title": "Connected", + "x": 384.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/RadioStatus/Connected", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "MatchTime", + "x": 256.0, + "y": 0.0, + "width": 256.0, + "height": 128.0, + "type": "Match Time", + "properties": { + "topic": "/AdvantageKit/DriverStation/MatchTime", + "period": 0.06, + "data_type": "double", + "time_display_mode": "Minutes and Seconds", + "red_start_time": 15, + "yellow_start_time": 30 + } + }, + { + "title": "FMSAttached", + "x": 0.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/FMSAttached", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "Enabled", + "x": 256.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/Enabled", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "DSAttached", + "x": 128.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/DSAttached", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "Autonomous", + "x": 640.0, + "y": 512.0, + "width": 256.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/Autonomous", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "AllianceStation", + "x": 768.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/AdvantageKit/DriverStation/AllianceStation", + "period": 0.06, + "data_type": "int" + } + } + ] + } + }, + { + "name": "Autonomous Chooser", + "grid_layout": { + "layouts": [], + "containers": [] + } + }, + { + "name": "Diagnostics", + "grid_layout": { + "layouts": [ + { + "title": "ByeByeRoller", + "x": 256.0, + "y": 0.0, + "width": 256.0, + "height": 256.0, + "type": "List Layout", + "properties": { + "label_position": "TOP" + }, + "children": [ + { + "title": "Encoder", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/ByeByeRoller/Encoder", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + } + ] + }, + { + "title": "Coral", + "x": 768.0, + "y": 0.0, + "width": 256.0, + "height": 384.0, + "type": "List Layout", + "properties": { + "label_position": "TOP" + }, + "children": [ + { + "title": "Encoder", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/Coral/Leader Encoder", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "ForwardLimit", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/Coral/LeaderLimit", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + } + ] + }, + { + "title": "Elevator", + "x": 512.0, + "y": 0.0, + "width": 256.0, + "height": 384.0, + "type": "List Layout", + "properties": { + "label_position": "TOP" + }, + "children": [ + { + "title": "Encoder", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/Elevator/Encoder", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "ForwardLimit", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/Elevator/ForwardLimit", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "ReverseLimit", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/Elevator/ReverseLimit", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + } + ] + }, + { + "title": "HiHiExtender", + "x": 1024.0, + "y": 0.0, + "width": 256.0, + "height": 384.0, + "type": "List Layout", + "properties": { + "label_position": "TOP" + }, + "children": [ + { + "title": "Encoder", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/HiHiExtender/Encoder", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "ForwardLimit", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/HiHiExtender/ForwardLimit", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "ReverseLimit", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/HiHiExtender/ReverseLimit", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + } + ] + }, + { + "title": "HiHiRoller", + "x": 0.0, + "y": 0.0, + "width": 256.0, + "height": 256.0, + "type": "List Layout", + "properties": { + "label_position": "TOP" + }, + "children": [ + { + "title": "Encoder", + "x": 0.0, + "y": 0.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/Shuffleboard/Diagnostics/HiHiRoller/Encoder", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + } + ] + } + ], + "containers": [] + } + } + ] +} \ No newline at end of file From 88bf89a9d795478a21965f57064830d04ea54132 Mon Sep 17 00:00:00 2001 From: Joseph Kantrowitz Date: Sat, 1 Mar 2025 16:13:58 -0500 Subject: [PATCH 2/4] update --- ...porary_needCAMERASandAUTOCHOOSER_1.2.json} | 297 +++++++----------- 1 file changed, 112 insertions(+), 185 deletions(-) rename elastic_layouts/{driver-layout-temp_needCAMERASandAUTOCHOOSER => elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json} (83%) diff --git a/elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER b/elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json similarity index 83% rename from elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER rename to elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json index fdf060a4..fc042ca0 100644 --- a/elastic_layouts/driver-layout-temp_needCAMERASandAUTOCHOOSER +++ b/elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json @@ -2,191 +2,6 @@ "version": 1.0, "grid_size": 128, "tabs": [ - { - "name": "Teleoperated", - "grid_layout": { - "layouts": [], - "containers": [ - { - "title": "Field", - "x": 0.0, - "y": 128.0, - "width": 896.0, - "height": 384.0, - "type": "Field", - "properties": { - "topic": "/SmartDashboard/Field", - "period": 0.06, - "field_game": "Reefscape", - "robot_width": 0.85, - "robot_length": 0.85, - "show_other_objects": true, - "show_trajectories": true, - "field_rotation": 0.0, - "robot_color": 4294198070, - "trajectory_color": 4294967295 - } - }, - { - "title": "EventName", - "x": 512.0, - "y": 0.0, - "width": 256.0, - "height": 128.0, - "type": "Large Text Display", - "properties": { - "topic": "/FMSInfo/EventName", - "period": 0.06, - "data_type": "string" - } - }, - { - "title": "IsRedAlliance", - "x": 512.0, - "y": 512.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/FMSInfo/IsRedAlliance", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "MatchNumber", - "x": 0.0, - "y": 0.0, - "width": 256.0, - "height": 128.0, - "type": "Large Text Display", - "properties": { - "topic": "/FMSInfo/MatchNumber", - "period": 0.06, - "data_type": "int" - } - }, - { - "title": "Connected", - "x": 384.0, - "y": 512.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/RadioStatus/Connected", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "MatchTime", - "x": 256.0, - "y": 0.0, - "width": 256.0, - "height": 128.0, - "type": "Match Time", - "properties": { - "topic": "/AdvantageKit/DriverStation/MatchTime", - "period": 0.06, - "data_type": "double", - "time_display_mode": "Minutes and Seconds", - "red_start_time": 15, - "yellow_start_time": 30 - } - }, - { - "title": "FMSAttached", - "x": 0.0, - "y": 512.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/DriverStation/FMSAttached", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "Enabled", - "x": 256.0, - "y": 512.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/DriverStation/Enabled", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "DSAttached", - "x": 128.0, - "y": 512.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/DriverStation/DSAttached", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "Autonomous", - "x": 640.0, - "y": 512.0, - "width": 256.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/DriverStation/Autonomous", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "None", - "false_icon": "None" - } - }, - { - "title": "AllianceStation", - "x": 768.0, - "y": 0.0, - "width": 128.0, - "height": 128.0, - "type": "Large Text Display", - "properties": { - "topic": "/AdvantageKit/DriverStation/AllianceStation", - "period": 0.06, - "data_type": "int" - } - } - ] - } - }, { "name": "Autonomous Chooser", "grid_layout": { @@ -436,6 +251,118 @@ ], "containers": [] } + }, + { + "name": "Teleoperated", + "grid_layout": { + "layouts": [], + "containers": [ + { + "title": "Field", + "x": 0.0, + "y": 0.0, + "width": 896.0, + "height": 512.0, + "type": "Field", + "properties": { + "topic": "/SmartDashboard/Field", + "period": 0.06, + "field_game": "Reefscape", + "robot_width": 0.85, + "robot_length": 0.85, + "show_other_objects": true, + "show_trajectories": true, + "field_rotation": 0.0, + "robot_color": 4294198070, + "trajectory_color": 4294967295 + } + }, + { + "title": "FMSAttached", + "x": 0.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/FMSAttached", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "Connected", + "x": 256.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/RadioStatus/Connected", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "Autonomous", + "x": 384.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/Autonomous", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "Enabled", + "x": 128.0, + "y": 512.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/DriverStation/Enabled", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "None", + "false_icon": "None" + } + }, + { + "title": "MatchTime", + "x": 512.0, + "y": 512.0, + "width": 256.0, + "height": 128.0, + "type": "Match Time", + "properties": { + "topic": "/AdvantageKit/DriverStation/MatchTime", + "period": 0.06, + "data_type": "double", + "time_display_mode": "Minutes and Seconds", + "red_start_time": 15, + "yellow_start_time": 30 + } + } + ] + } } ] } \ No newline at end of file From 1b4196bf94692dccc5d381fb9ba238d5e7b9502c Mon Sep 17 00:00:00 2001 From: Joseph Kantrowitz Date: Wed, 5 Mar 2025 19:41:43 -0500 Subject: [PATCH 3/4] updated elastic layout - this is final --- ....json => elastic-layout-driveteam-v2.json} | 90 ++++++++++++++++--- 1 file changed, 79 insertions(+), 11 deletions(-) rename elastic_layouts/{elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json => elastic-layout-driveteam-v2.json} (84%) diff --git a/elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json b/elastic_layouts/elastic-layout-driveteam-v2.json similarity index 84% rename from elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json rename to elastic_layouts/elastic-layout-driveteam-v2.json index fc042ca0..f8988dcd 100644 --- a/elastic_layouts/elastic-layout-temporary_needCAMERASandAUTOCHOOSER_1.2.json +++ b/elastic_layouts/elastic-layout-driveteam-v2.json @@ -2,13 +2,6 @@ "version": 1.0, "grid_size": 128, "tabs": [ - { - "name": "Autonomous Chooser", - "grid_layout": { - "layouts": [], - "containers": [] - } - }, { "name": "Diagnostics", "grid_layout": { @@ -259,10 +252,10 @@ "containers": [ { "title": "Field", - "x": 0.0, + "x": 768.0, "y": 0.0, - "width": 896.0, - "height": 512.0, + "width": 384.0, + "height": 640.0, "type": "Field", "properties": { "topic": "/SmartDashboard/Field", @@ -272,7 +265,7 @@ "robot_length": 0.85, "show_other_objects": true, "show_trajectories": true, - "field_rotation": 0.0, + "field_rotation": 90.0, "robot_color": 4294198070, "trajectory_color": 4294967295 } @@ -360,6 +353,81 @@ "red_start_time": 15, "yellow_start_time": 30 } + }, + { + "title": "DriverCam", + "x": 0.0, + "y": 0.0, + "width": 768.0, + "height": 512.0, + "type": "Camera Stream", + "properties": { + "topic": "/CameraPublisher/DriverCam", + "period": 0.06, + "rotation_turns": 3, + "resolution": [ + 0.0, + 0.0 + ] + } + } + ] + } + }, + { + "name": "Autonomous Chooser", + "grid_layout": { + "layouts": [], + "containers": [ + { + "title": "AutoActionFeedback", + "x": 768.0, + "y": 0.0, + "width": 384.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/Shuffleboard/Auto/AutoActionFeedback", + "period": 0.06, + "data_type": "string" + } + }, + { + "title": "FieldLocationFeedback", + "x": 768.0, + "y": 128.0, + "width": 384.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/Shuffleboard/Auto/FieldLocationFeedback", + "period": 0.06, + "data_type": "string" + } + }, + { + "title": "Auto Action", + "x": 0.0, + "y": 0.0, + "width": 768.0, + "height": 128.0, + "type": "Split Button Chooser", + "properties": { + "topic": "/Shuffleboard/Auto/Auto Action", + "period": 0.06 + } + }, + { + "title": "Location Chooser", + "x": 0.0, + "y": 128.0, + "width": 768.0, + "height": 128.0, + "type": "Split Button Chooser", + "properties": { + "topic": "/Shuffleboard/Auto/Location Chooser", + "period": 0.06 + } } ] } From 366f448ae715fb35e4a8de566c296b90dd127efa Mon Sep 17 00:00:00 2001 From: Joseph Kantrowitz Date: Wed, 5 Mar 2025 19:50:02 -0500 Subject: [PATCH 4/4] updated driveteam elastic final version --- elastic_layouts/elastic-layout-driveteam-v2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elastic_layouts/elastic-layout-driveteam-v2.json b/elastic_layouts/elastic-layout-driveteam-v2.json index f8988dcd..a2720c4a 100644 --- a/elastic_layouts/elastic-layout-driveteam-v2.json +++ b/elastic_layouts/elastic-layout-driveteam-v2.json @@ -433,4 +433,4 @@ } } ] -} \ No newline at end of file +}