elastic update

diff --git a/src/main/deploy/elastic-layout.json b/src/main/deploy/elastic-layout.json
index 7852f2c49725455d729a4ba88543f84b1725bb84..7811b8ea663e74e0d3165b1132ca810eab25e703 100644 (file)
--- a/src/main/deploy/elastic-layout.json
+++ b/src/main/deploy/elastic-layout.json
@@ -9,8 +9,8 @@
         "containers": [
           {
             "title": "WON AUTO?",
-            "x": 256.0,
-            "y": 512.0,
+            "x": 1280.0,
+            "y": 256.0,
             "width": 384.0,
             "height": 256.0,
             "type": "Large Text Display",
@@ -22,9 +22,9 @@
           },
           {
             "title": "Turret position",
-            "x": 1152.0,
+            "x": 1024.0,
             "y": 0.0,
-            "width": 512.0,
+            "width": 384.0,
             "height": 256.0,
             "type": "Graph",
             "properties": {
@@ -32,31 +32,33 @@
               "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": 640.0,
-            "y": 512.0,
+            "x": 768.0,
+            "y": 128.0,
             "width": 256.0,
             "height": 128.0,
-            "type": "Text Display",
+            "type": "Number Bar",
             "properties": {
               "topic": "/SmartDashboard/Target Velocity RPS",
               "period": 0.06,
               "data_type": "double",
-              "show_submit_button": false
+              "min_value": -60.0,
+              "max_value": 0.0,
+              "divisions": 5,
+              "inverted": true,
+              "orientation": "horizontal"
             }
           },
           {
             "title": "Intake Calibrated",
-            "x": 0.0,
-            "y": 512.0,
-            "width": 256.0,
+            "x": 256.0,
+            "y": 0.0,
+            "width": 128.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -71,9 +73,9 @@
           },
           {
             "title": "Hood Calibrated",
-            "x": 0.0,
-            "y": 640.0,
-            "width": 256.0,
+            "x": 128.0,
+            "y": 0.0,
+            "width": 128.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -89,8 +91,8 @@
           {
             "title": "Turret Calibrated",
             "x": 0.0,
-            "y": 768.0,
-            "width": 256.0,
+            "y": 0.0,
+            "width": 128.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
@@ -103,12 +105,29 @@
               "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": 0.0,
-            "width": 896.0,
-            "height": 512.0,
+            "y": 128.0,
+            "width": 768.0,
+            "height": 384.0,
             "type": "Field",
             "properties": {
               "topic": "/SmartDashboard/Field",
@@ -125,46 +144,48 @@
             }
           },
           {
-            "title": "Voltage",
-            "x": 896.0,
-            "y": 768.0,
-            "width": 512.0,
+            "title": "Hood At Setpoint",
+            "x": 128.0,
+            "y": 512.0,
+            "width": 128.0,
             "height": 128.0,
-            "type": "Voltage View",
+            "type": "Boolean Box",
             "properties": {
-              "topic": "/AdvantageKit/PowerDistribution/Voltage",
+              "topic": "/SmartDashboard/Hood At Setpoint",
               "period": 0.06,
-              "data_type": "double",
-              "min_value": 4.0,
-              "max_value": 13.0,
-              "divisions": 5,
-              "inverted": false,
-              "orientation": "horizontal"
+              "data_type": "boolean",
+              "true_color": 4283215696,
+              "false_color": 4294198070,
+              "true_icon": "None",
+              "false_icon": "None"
             }
           },
           {
-            "title": "RobotID",
-            "x": 1408.0,
-            "y": 768.0,
-            "width": 256.0,
+            "title": "Turret At Setpoint",
+            "x": 0.0,
+            "y": 512.0,
+            "width": 128.0,
             "height": 128.0,
-            "type": "Text Display",
+            "type": "Boolean Box",
             "properties": {
-              "topic": "/SmartDashboard/RobotID",
+              "topic": "/SmartDashboard/Turret At Setpoint",
               "period": 0.06,
-              "data_type": "string",
-              "show_submit_button": false
+              "data_type": "boolean",
+              "true_color": 4283215696,
+              "false_color": 4294198070,
+              "true_icon": "None",
+              "false_icon": "None"
             }
           },
           {
-            "title": "Spindexer Jamming",
+            "title": "Intake At Setpoint",
             "x": 256.0,
-            "y": 768.0,
-            "width": 384.0,
+            "y": 512.0,
+            "width": 128.0,
             "height": 128.0,
             "type": "Boolean Box",
             "properties": {
-              "topic": "/SmartDashboard/Spindexer Run Reverse/running",
+              "topic": "/SmartDashboard/Intake At Setpoint",
               "period": 0.06,
               "data_type": "boolean",
               "true_color": 4283215696,
@@ -174,133 +195,117 @@
             }
           },
           {
-            "title": "Shooter Power Modifier",
-            "x": 1408.0,
-            "y": 256.0,
-            "width": 256.0,
+            "title": "Voltage",
+            "x": 512.0,
+            "y": 0.0,
+            "width": 512.0,
             "height": 128.0,
-            "type": "Text Display",
+            "type": "Voltage View",
             "properties": {
-              "topic": "/SmartDashboard/OPERATOR: Shooter Power Modifier",
+              "topic": "/AdvantageKit/PowerDistribution/Voltage",
               "period": 0.06,
               "data_type": "double",
-              "show_submit_button": false
+              "min_value": 4.0,
+              "max_value": 13.0,
+              "divisions": 5,
+              "inverted": false,
+              "orientation": "horizontal"
             }
           },
           {
-            "title": "OPERATOR: Hood Offset",
+            "title": "RobotID",
             "x": 1408.0,
-            "y": 384.0,
+            "y": 0.0,
             "width": 256.0,
             "height": 128.0,
             "type": "Text Display",
             "properties": {
-              "topic": "/SmartDashboard/OPERATOR: Hood Offset",
+              "topic": "/SmartDashboard/RobotID",
               "period": 0.06,
-              "data_type": "double",
+              "data_type": "string",
               "show_submit_button": false
             }
           },
           {
-            "title": "OPERATOR: Phase Delay",
+            "title": "OPERATOR: Shooter Power Modifier",
             "x": 1408.0,
-            "y": 512.0,
+            "y": 128.0,
             "width": 256.0,
             "height": 128.0,
             "type": "Text Display",
             "properties": {
-              "topic": "/SmartDashboard/OPERATOR: Phase Delay",
+              "topic": "/SmartDashboard/OPERATOR: Shooter Power Modifier",
               "period": 0.06,
               "data_type": "double",
               "show_submit_button": false
             }
           },
           {
-            "title": "OPERATOR: Turret Offset",
-            "x": 1408.0,
-            "y": 640.0,
-            "width": 256.0,
+            "title": "Auto chooser",
+            "x": 1280.0,
+            "y": 512.0,
+            "width": 384.0,
             "height": 128.0,
-            "type": "Text Display",
+            "type": "ComboBox Chooser",
+            "properties": {
+              "topic": "/SmartDashboard/Auto chooser",
+              "period": 0.06,
+              "sort_options": false
+            }
+          },
+          {
+            "title": "Match Time",
+            "x": 768.0,
+            "y": 256.0,
+            "width": 512.0,
+            "height": 384.0,
+            "type": "Match Time",
             "properties": {
-              "topic": "/SmartDashboard/OPERATOR: Turret Offset",
+              "topic": "/SmartDashboard/Match Time",
               "period": 0.06,
               "data_type": "double",
-              "show_submit_button": false
+              "time_display_mode": "Minutes and Seconds",
+              "red_start_time": 20,
+              "yellow_start_time": 30
             }
           },
           {
-            "title": "Auto chooser",
-            "x": 896.0,
-            "y": 0.0,
-            "width": 256.0,
+            "title": "Phase Countdown",
+            "x": 0.0,
+            "y": 640.0,
+            "width": 384.0,
             "height": 256.0,
-            "type": "ComboBox Chooser",
+            "type": "Match Time",
             "properties": {
-              "topic": "/SmartDashboard/Auto chooser",
+              "topic": "/SmartDashboard/Phase Countdown",
               "period": 0.06,
-              "sort_options": false
+              "data_type": "double",
+              "time_display_mode": "Minutes and Seconds",
+              "red_start_time": 20,
+              "yellow_start_time": 30
             }
-          }
-        ]
-      }
-    },
-    {
-      "name": "Autonomous",
-      "grid_layout": {
-        "layouts": [],
-        "containers": []
-      }
-    },
-    {
-      "name": "Field",
-      "grid_layout": {
-        "layouts": [],
-        "containers": [
+          },
           {
-            "title": "Field",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 1664.0,
-            "height": 896.0,
-            "type": "Field",
+            "title": "Current Phase",
+            "x": 384.0,
+            "y": 512.0,
+            "width": 384.0,
+            "height": 128.0,
+            "type": "Large Text Display",
             "properties": {
-              "topic": "/SmartDashboard/Field",
+              "topic": "/SmartDashboard/Current Phase",
               "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
+              "data_type": "string"
             }
           }
         ]
       }
     },
     {
-      "name": "Pit Setup",
+      "name": "Autonomous",
       "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
-            }
-          }
-        ]
+        "containers": []
       }
     }
   ]