From 5b85bb4ace55dd116c3e80c496ad3ebf986ebfc8 Mon Sep 17 00:00:00 2001 From: Shikhar Date: Mon, 9 Mar 2026 10:27:13 -0600 Subject: [PATCH] Pikes Peak day 3 --- elastic-layout.json | 199 +++++++++++------- .../robot/constants/BuildConstants.java | 10 +- .../subsystems/intake/IntakeConstants.java | 2 +- 3 files changed, 125 insertions(+), 86 deletions(-) diff --git a/elastic-layout.json b/elastic-layout.json index 63ee31c..53d53bb 100644 --- a/elastic-layout.json +++ b/elastic-layout.json @@ -8,32 +8,15 @@ "layouts": [ { "title": "Tag Processed", - "x": 1024.0, - "y": 128.0, - "width": 384.0, - "height": 384.0, + "x": 384.0, + "y": 0.0, + "width": 256.0, + "height": 256.0, "type": "List Layout", "properties": { "label_position": "TOP" }, "children": [ - { - "title": "LeftCamTag", - "x": 896.0, - "y": 256.0, - "width": 128.0, - "height": 128.0, - "type": "Boolean Box", - "properties": { - "topic": "/AdvantageKit/Vision/Camera0/IsTagProcessed", - "period": 0.06, - "data_type": "boolean", - "true_color": 4283215696, - "false_color": 4294198070, - "true_icon": "Checkmark", - "false_icon": "X" - } - }, { "title": "RightCamTag", "x": 768.0, @@ -50,40 +33,28 @@ "true_icon": "Checkmark", "false_icon": "X" } + }, + { + "title": "LeftCamTag", + "x": 896.0, + "y": 256.0, + "width": 128.0, + "height": 128.0, + "type": "Boolean Box", + "properties": { + "topic": "/AdvantageKit/Vision/Camera0/IsTagProcessed", + "period": 0.06, + "data_type": "boolean", + "true_color": 4283215696, + "false_color": 4294198070, + "true_icon": "Checkmark", + "false_icon": "X" + } } ] } ], "containers": [ - { - "title": "FMSInfo", - "x": 0.0, - "y": 512.0, - "width": 384.0, - "height": 128.0, - "type": "FMSInfo", - "properties": { - "topic": "/FMSInfo", - "period": 0.06 - } - }, - { - "title": "Alliance", - "x": 0.0, - "y": 256.0, - "width": 384.0, - "height": 256.0, - "type": "Boolean Box", - "properties": { - "topic": "/FMSInfo/IsRedAlliance", - "period": 0.06, - "data_type": "boolean", - "true_color": 4294901760, - "false_color": 4279107839, - "true_icon": "None", - "false_icon": "None" - } - }, { "title": "MatchTime", "x": 0.0, @@ -100,30 +71,12 @@ "yellow_start_time": 30 } }, - { - "title": "BatteryVoltage", - "x": 1024.0, - "y": 512.0, - "width": 384.0, - "height": 128.0, - "type": "Voltage View", - "properties": { - "topic": "/AdvantageKit/SystemStats/BatteryVoltage", - "period": 0.06, - "data_type": "double", - "min_value": 4.0, - "max_value": 13.0, - "divisions": 5, - "inverted": false, - "orientation": "horizontal" - } - }, { "title": "RetractedLimit", - "x": 640.0, - "y": 128.0, - "width": 384.0, - "height": 384.0, + "x": 0.0, + "y": 384.0, + "width": 128.0, + "height": 128.0, "type": "Boolean Box", "properties": { "topic": "/AdvantageKit/Intake/RetractedLimit", @@ -137,9 +90,9 @@ }, { "title": "Auto Chooser", - "x": 640.0, - "y": 0.0, - "width": 768.0, + "x": 1024.0, + "y": 256.0, + "width": 384.0, "height": 128.0, "type": "ComboBox Chooser", "properties": { @@ -150,9 +103,9 @@ }, { "title": "Roller Percent Output", - "x": 640.0, - "y": 512.0, - "width": 384.0, + "x": 0.0, + "y": 256.0, + "width": 256.0, "height": 128.0, "type": "Number Slider", "properties": { @@ -164,6 +117,78 @@ "divisions": 5, "update_continuously": false } + }, + { + "title": "Shooter OVERRIDE Velocity", + "x": 128.0, + "y": 384.0, + "width": 128.0, + "height": 128.0, + "type": "Text Display", + "properties": { + "topic": "/SmartDashboard/Shooter OVERRIDE Velocity", + "period": 0.06, + "data_type": "double", + "show_submit_button": true + } + }, + { + "title": "TRIM SHOOTER SPEED", + "x": 256.0, + "y": 256.0, + "width": 384.0, + "height": 128.0, + "type": "Number Slider", + "properties": { + "topic": "/SmartDashboard/TRIM SHOOTER SPEED", + "period": 0.06, + "data_type": "double", + "min_value": -3.0, + "max_value": 0.0, + "divisions": 5, + "update_continuously": false + } + }, + { + "title": "Mode", + "x": 256.0, + "y": 384.0, + "width": 384.0, + "height": 128.0, + "type": "Text Display", + "properties": { + "topic": "/AdvantageKit/RealOutputs/LED/Mode", + "period": 0.06, + "data_type": "string", + "show_submit_button": true + } + }, + { + "title": "Time to rev", + "x": 768.0, + "y": 128.0, + "width": 256.0, + "height": 128.0, + "type": "Large Text Display", + "properties": { + "topic": "/AdvantageKit/RealOutputs/Time to rev", + "period": 0.06, + "data_type": "double" + } + }, + { + "title": "Arm angle extended", + "x": 1152.0, + "y": 128.0, + "width": 256.0, + "height": 128.0, + "type": "Text Display", + "properties": { + "topic": "/SmartDashboard/Arm angle extended", + "period": 0.06, + "data_type": "double", + "show_submit_button": true + } } ] } @@ -527,12 +552,26 @@ "data_type": "double", "show_submit_button": true } + }, + { + "title": "Shooter OVERRIDE Velocity", + "x": 640.0, + "y": 512.0, + "width": 256.0, + "height": 128.0, + "type": "Text Display", + "properties": { + "topic": "/SmartDashboard/Shooter OVERRIDE Velocity", + "period": 0.06, + "data_type": "double", + "show_submit_button": true + } } ] } }, { - "name": "Tab 3", + "name": "Miraland", "grid_layout": { "layouts": [], "containers": [ @@ -540,7 +579,7 @@ "title": "Auto Chooser", "x": 0.0, "y": 0.0, - "width": 1536.0, + "width": 640.0, "height": 768.0, "type": "ComboBox Chooser", "properties": { diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 1185453..9ff0c32 100644 --- a/src/main/java/frc4388/robot/constants/BuildConstants.java +++ b/src/main/java/frc4388/robot/constants/BuildConstants.java @@ -7,12 +7,12 @@ public final class BuildConstants { public static final String MAVEN_GROUP = ""; public static final String MAVEN_NAME = "2026KPopRobotHunters"; public static final String VERSION = "unspecified"; - public static final int GIT_REVISION = 146; - public static final String GIT_SHA = "0ce384a9402300fbc7b2c1b609c507284c5caa3c"; - public static final String GIT_DATE = "2026-03-06 22:52:06 MST"; + public static final int GIT_REVISION = 147; + public static final String GIT_SHA = "b073fad27703951ba251eaffc56d86f791e531e6"; + public static final String GIT_DATE = "2026-03-07 20:08:15 MST"; public static final String GIT_BRANCH = "PikesPeak"; - public static final String BUILD_DATE = "2026-03-07 15:12:09 MST"; - public static final long BUILD_UNIX_TIME = 1772921529065L; + public static final String BUILD_DATE = "2026-03-08 14:27:19 MDT"; + public static final long BUILD_UNIX_TIME = 1773001639109L; public static final int DIRTY = 1; private BuildConstants(){} diff --git a/src/main/java/frc4388/robot/subsystems/intake/IntakeConstants.java b/src/main/java/frc4388/robot/subsystems/intake/IntakeConstants.java index d2b4768..dc82e42 100644 --- a/src/main/java/frc4388/robot/subsystems/intake/IntakeConstants.java +++ b/src/main/java/frc4388/robot/subsystems/intake/IntakeConstants.java @@ -34,7 +34,7 @@ public class IntakeConstants { // public static final Angle ARM_LIMIT_UPPER = Degrees.of(-90); public static final ConfigurableDouble ARM_LIMIT_RETRACTED = new ConfigurableDouble("Arm angle retracted", 0.1); - public static final ConfigurableDouble ARM_LIMIT_EXTENDED = new ConfigurableDouble("Arm angle extended", 0.3); + public static final ConfigurableDouble ARM_LIMIT_EXTENDED = new ConfigurableDouble("Arm angle extended", 0.33); public static final ConfigurableDouble ARM_EXTEND_PERCENT_OUTPUT = new ConfigurableDouble("Arm extend % output", 0.4); public static final ConfigurableDouble ARM_RETRACT_PERCENT_OUTPUT = new ConfigurableDouble("Arm retract % output", -0.4); public static final ConfigurableDouble ROLLER_PERCENT_OUTPUT = new ConfigurableDouble("Roller Percent Output", .70);