From c18630919f162b5778d7d9655a99ac027d636e3f Mon Sep 17 00:00:00 2001 From: mimigamin Date: Mon, 27 Apr 2026 23:58:25 -0600 Subject: [PATCH] New bindings --- elastic-layout.json | 4 ++++ src/main/java/frc4388/robot/RobotContainer.java | 7 +++---- .../java/frc4388/robot/constants/BuildConstants.java | 12 ++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/elastic-layout.json b/elastic-layout.json index 2f0184a..bc04735 100644 --- a/elastic-layout.json +++ b/elastic-layout.json @@ -60,6 +60,8 @@ "period": 0.033, "data_type": "double", "time_displayed": 5.0, + "min_value": -1.0, + "max_value": 1.0, "color": 4278238420, "line_width": 2.0 } @@ -76,6 +78,8 @@ "period": 0.033, "data_type": "double", "time_displayed": 5.0, + "min_value": -1.0, + "max_value": 1.0, "color": 4278238420, "line_width": 2.0 } diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index af0c2a9..374f6b8 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -170,7 +170,7 @@ public class RobotContainer { private void configureSINGLEBindings() { - String controllerInstructions = "Single Controller: \n- A: Reset Gyro \n- Right Bumper: Shift Up \n- Left Bumper: Shift Down \n- X Button: Roller On \n- Y Button: Roller Off \n- B Button: Labubu Growl \n- Back Button: Manual shoot \n- Menu Button: Expels balls"; + String controllerInstructions = "Single Controller: \n- A: Reset Gyro \n- Right Bumper: Shift Up \n- Left Bumper: Shift Down \n- X Button: Roller On \n- Y Button: Roller Off \n- B Button: Labubu Growl \n- Right Trigger: Manual shoot \n- Menu Button: Expels balls"; SmartDashboard.putString("Controller Binds", controllerInstructions); @@ -183,7 +183,7 @@ public class RobotContainer { new JoystickButton(getDeadbandedDriverController(), XboxController.LEFT_BUMPER_BUTTON) .onTrue(new InstantCommand(() -> m_robotSwerveDrive.shiftDown())); - new JoystickButton(getDeadbandedDriverController(), XboxController.BACK_BUTTON) + new Trigger(() -> getDeadbandedDriverController().getRightTriggerAxis() >= 0.5) .onTrue(new InstantCommand(() -> { m_robotShooter.spinUpFeeding(); m_robotIntake.rollerStop(); @@ -194,8 +194,7 @@ public class RobotContainer { new JoystickButton(getDeadbandedDriverController(), XboxController.START_BUTTON) .onTrue(new InstantCommand(() -> { - m_robotShooter.spinUpFeeding(); - m_robotIntake.rollerStop(); + m_robotIntake.setMode(IntakeMode.ExpelBalls); })); diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index d2ec612..c968b22 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 = 242; - public static final String GIT_SHA = "a15a6d08bf31c3ec80ed3e4327cbf214cc9781f5"; - public static final String GIT_DATE = "2026-04-17 18:42:57 MDT"; - public static final String GIT_BRANCH = "DemoBranch-(No-Intake)"; - public static final String BUILD_DATE = "2026-04-27 23:44:57 MDT"; - public static final long BUILD_UNIX_TIME = 1777355097369L; + public static final int GIT_REVISION = 243; + public static final String GIT_SHA = "41461c9b0707ba66adfc122d3799f0313a621389"; + public static final String GIT_DATE = "2026-04-27 23:50:59 MDT"; + public static final String GIT_BRANCH = "DemoBranch--(NoIntake)"; + public static final String BUILD_DATE = "2026-04-27 23:56:02 MDT"; + public static final long BUILD_UNIX_TIME = 1777355762797L; public static final int DIRTY = 1; private BuildConstants(){}