new elastic

diff --git a/src/main/deploy/elastic-layout.json b/src/main/deploy/elastic-layout.json
index efeb9605c196867d393d37108d5ef43e4843beef..7852f2c49725455d729a4ba88543f84b1725bb84 100644 (file)
--- a/src/main/deploy/elastic-layout.json
+++ b/src/main/deploy/elastic-layout.json
@@ -9,10 +9,10 @@
         "containers": [
           {
             "title": "WON AUTO?",
-            "x": 768.0,
-            "y": 128.0,
-            "width": 256.0,
-            "height": 128.0,
+            "x": 256.0,
+            "y": 512.0,
+            "width": 384.0,
+            "height": 256.0,
             "type": "Large Text Display",
             "properties": {
               "topic": "/SmartDashboard/WON AUTO?",
@@ -22,9 +22,9 @@
           },
           {
             "title": "Turret position",
-            "x": 1024.0,
+            "x": 1152.0,
             "y": 0.0,
-            "width": 384.0,
+            "width": 512.0,
             "height": 256.0,
             "type": "Graph",
             "properties": {
@@ -32,15 +32,17 @@
               "period": 0.033,
               "data_type": "double",
               "time_displayed": 5.0,
+              "min_value": -300.0,
+              "max_value": 250.0,
               "color": 4278238420,
               "line_width": 2.0
             }
           },
           {
             "title": "Target Velocity RPS",
-            "x": 512.0,
-            "y": 0.0,
-            "width": 128.0,
+            "x": 640.0,
+            "y": 512.0,
+            "width": 256.0,
             "height": 128.0,
             "type": "Text Display",
             "properties": {
@@ -52,9 +54,9 @@
           },
           {
             "title": "Intake Calibrated",
-            "x": 256.0,
-            "y": 0.0,
-            "width": 128.0,
+            "x": 0.0,
+            "y": 512.0,
+            "width": 256.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -69,9 +71,9 @@
           },
           {
             "title": "Hood Calibrated",
-            "x": 128.0,
-            "y": 0.0,
-            "width": 128.0,
+            "x": 0.0,
+            "y": 640.0,
+            "width": 256.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -87,8 +89,8 @@
           {
             "title": "Turret Calibrated",
             "x": 0.0,
-            "y": 0.0,
-            "width": 128.0,
+            "y": 768.0,
+            "width": 256.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -101,29 +103,12 @@
               "false_icon": "None"
             }
           },
-          {
-            "title": "Climb Calibrated",
-            "x": 384.0,
-            "y": 0.0,
-            "width": 128.0,
-            "height": 128.0,
-            "type": "Boolean Box",
-            "properties": {
-              "topic": "/SmartDashboard/Climb Calibrated",
-              "period": 0.06,
-              "data_type": "boolean",
-              "true_color": 4283215696,
-              "false_color": 4294198070,
-              "true_icon": "None",
-              "false_icon": "None"
-            }
-          },
           {
             "title": "Field",
             "x": 0.0,
-            "y": 128.0,
-            "width": 768.0,
-            "height": 384.0,
+            "y": 0.0,
+            "width": 896.0,
+            "height": 512.0,
             "type": "Field",
             "properties": {
               "topic": "/SmartDashboard/Field",
@@ -140,48 +125,46 @@
             }
           },
           {
-            "title": "Hood At Setpoint",
-            "x": 128.0,
-            "y": 512.0,
-            "width": 128.0,
+            "title": "Voltage",
+            "x": 896.0,
+            "y": 768.0,
+            "width": 512.0,
             "height": 128.0,
-            "type": "Boolean Box",
+            "type": "Voltage View",
             "properties": {
-              "topic": "/SmartDashboard/Hood At Setpoint",
+              "topic": "/AdvantageKit/PowerDistribution/Voltage",
               "period": 0.06,
-              "data_type": "boolean",
-              "true_color": 4283215696,
-              "false_color": 4294198070,
-              "true_icon": "None",
-              "false_icon": "None"
+              "data_type": "double",
+              "min_value": 4.0,
+              "max_value": 13.0,
+              "divisions": 5,
+              "inverted": false,
+              "orientation": "horizontal"
             }
           },
           {
-            "title": "Turret At Setpoint",
-            "x": 0.0,
-            "y": 512.0,
-            "width": 128.0,
+            "title": "RobotID",
+            "x": 1408.0,
+            "y": 768.0,
+            "width": 256.0,
             "height": 128.0,
-            "type": "Boolean Box",
+            "type": "Text Display",
             "properties": {
-              "topic": "/SmartDashboard/Turret At Setpoint",
+              "topic": "/SmartDashboard/RobotID",
               "period": 0.06,
-              "data_type": "boolean",
-              "true_color": 4283215696,
-              "false_color": 4294198070,
-              "true_icon": "None",
-              "false_icon": "None"
+              "data_type": "string",
+              "show_submit_button": false
             }
           },
           {
-            "title": "Intake At Setpoint",
+            "title": "Spindexer Jamming",
             "x": 256.0,
-            "y": 512.0,
-            "width": 128.0,
+            "y": 768.0,
+            "width": 384.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
-              "topic": "/SmartDashboard/Intake At Setpoint",
+              "topic": "/SmartDashboard/Spindexer Run Reverse/running",
               "period": 0.06,
               "data_type": "boolean",
               "true_color": 4283215696,
@@ -191,36 +174,73 @@
             }
           },
           {
-            "title": "Voltage",
-            "x": 640.0,
-            "y": 0.0,
-            "width": 384.0,
+            "title": "Shooter Power Modifier",
+            "x": 1408.0,
+            "y": 256.0,
+            "width": 256.0,
             "height": 128.0,
-            "type": "Voltage View",
+            "type": "Text Display",
             "properties": {
-              "topic": "/AdvantageKit/PowerDistribution/Voltage",
+              "topic": "/SmartDashboard/OPERATOR: Shooter Power Modifier",
               "period": 0.06,
               "data_type": "double",
-              "min_value": 4.0,
-              "max_value": 13.0,
-              "divisions": 5,
-              "inverted": false,
-              "orientation": "horizontal"
+              "show_submit_button": false
             }
           },
           {
-            "title": "RobotID",
-            "x": 768.0,
-            "y": 256.0,
+            "title": "OPERATOR: Hood Offset",
+            "x": 1408.0,
+            "y": 384.0,
             "width": 256.0,
             "height": 128.0,
             "type": "Text Display",
             "properties": {
-              "topic": "/SmartDashboard/RobotID",
+              "topic": "/SmartDashboard/OPERATOR: Hood Offset",
               "period": 0.06,
-              "data_type": "string",
+              "data_type": "double",
+              "show_submit_button": false
+            }
+          },
+          {
+            "title": "OPERATOR: Phase Delay",
+            "x": 1408.0,
+            "y": 512.0,
+            "width": 256.0,
+            "height": 128.0,
+            "type": "Text Display",
+            "properties": {
+              "topic": "/SmartDashboard/OPERATOR: Phase Delay",
+              "period": 0.06,
+              "data_type": "double",
+              "show_submit_button": false
+            }
+          },
+          {
+            "title": "OPERATOR: Turret Offset",
+            "x": 1408.0,
+            "y": 640.0,
+            "width": 256.0,
+            "height": 128.0,
+            "type": "Text Display",
+            "properties": {
+              "topic": "/SmartDashboard/OPERATOR: Turret Offset",
+              "period": 0.06,
+              "data_type": "double",
               "show_submit_button": false
             }
+          },
+          {
+            "title": "Auto chooser",
+            "x": 896.0,
+            "y": 0.0,
+            "width": 256.0,
+            "height": 256.0,
+            "type": "ComboBox Chooser",
+            "properties": {
+              "topic": "/SmartDashboard/Auto chooser",
+              "period": 0.06,
+              "sort_options": false
+            }
           }
         ]
       }
@@ -231,6 +251,57 @@
         "layouts": [],
         "containers": []
       }
+    },
+    {
+      "name": "Field",
+      "grid_layout": {
+        "layouts": [],
+        "containers": [
+          {
+            "title": "Field",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 1664.0,
+            "height": 896.0,
+            "type": "Field",
+            "properties": {
+              "topic": "/SmartDashboard/Field",
+              "period": 0.06,
+              "field_game": "Rebuilt",
+              "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,
+              "show_robot_outside_widget": true
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "Pit Setup",
+      "grid_layout": {
+        "layouts": [],
+        "containers": [
+          {
+            "title": "min",
+            "x": 0.0,
+            "y": 0.0,
+            "width": 256.0,
+            "height": 128.0,
+            "type": "Command",
+            "properties": {
+              "topic": "/SmartDashboard/min",
+              "period": 0.06,
+              "show_type": true,
+              "maximize_button_space": false
+            }
+          }
+        ]
+      }
     }
   ]
 }
\ No newline at end of file