From 1a1d10cbc33b23d492037f6ef8a5253b4b111cc8 Mon Sep 17 00:00:00 2001 From: Aarav Date: Tue, 25 Apr 2023 17:02:12 -0600 Subject: [PATCH] fuckery --- gradle/wrapper/gradle-wrapper.properties | 5 +++-- src/main/java/frc4388/robot/Constants.java | 2 +- .../java/frc4388/robot/RobotContainer.java | 18 ++++++++--------- src/main/java/frc4388/robot/RobotMap.java | 20 +++++++++---------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d050f17..2a26d05 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Apr 24 12:32:17 MDT 2023 distributionBase=GRADLE_USER_HOME -distributionPath=permwrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip -zipStoreBase=GRADLE_USER_HOME +distributionPath=permwrapper/dists zipStorePath=permwrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index 22609dc..30998be 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -55,7 +55,7 @@ public final class Constants { public static final int SHOOTER_SOLENOID_7_ID = 8; } public static final class DebugConstants { - public static final boolean CAN_BUILD = no; + //public static final boolean CAN_BUILD = no; public static final boolean SHOW_INFO = true; public static final String TYPE_INFO = "INFO"; } diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 6e129a7..9c0e6ac 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -40,7 +40,7 @@ public class RobotContainer { private final LED m_robotLED = new LED(m_robotMap.LEDController); - private final Horn m_robotHorn = new Horn(m_robotMap.HornSolenoid); + //private final Horn m_robotHorn = new Horn(m_robotMap.HornSolenoid); /* final code private final Solenoid[] SolenoidArray = { m_robotMap.ShooterSolenoid0, @@ -61,11 +61,6 @@ public class RobotContainer { new Solenoid(3), new Solenoid(4), new Solenoid(5), - new Solenoid(6), - new Solenoid(7), - new Solenoid(8), - new Solenoid(9), - new Solenoid(10) }; private final ShootTube m_robotShooter = new ShootTube(SolenoidArray); @@ -110,15 +105,20 @@ public class RobotContainer { .whenReleased(() -> m_robotLED.setPattern(LEDConstants.DEFAULT_PATTERN)); */ /* Fire horn */ - new JoystickButton(getOperatorJoystick(), XboxController.LEFT_TRIGGER_AXIS) + /*new JoystickButton(getOperatorJoystick(), XboxController.LEFT_TRIGGER_AXIS) .whenPressed(() -> m_robotHorn.hornSet(true)) .whenReleased(() -> m_robotHorn.hornSet(false)); - + */ /* Shoot T-Shirt, Also cycles the array */ - new JoystickButton(getOperatorJoystick(), XboxController.RIGHT_TRIGGER_AXIS) + new JoystickButton(getOperatorJoystick(), XboxController.A_BUTTON) .whenPressed(() -> m_robotShooter.ShootTubeSet(true)) .whenReleased(() -> m_robotShooter.ShootTubeSet(false)); + + new JoystickButton(getOperatorJoystick(), XboxController.Y_BUTTON) + .whenPressed(() -> m_robotShooter.ShootTubeIndex(true, 0)) + .whenReleased(() -> m_robotShooter.ShootTubeIndex(false, 0)); + /* Cycle Between Solenoids */ new JoystickButton(getOperatorJoystick(), XboxController.LEFT_BUMPER_BUTTON) .whenPressed(() -> m_robotShooter.CycleDown()); diff --git a/src/main/java/frc4388/robot/RobotMap.java b/src/main/java/frc4388/robot/RobotMap.java index d70541c..fd7e789 100644 --- a/src/main/java/frc4388/robot/RobotMap.java +++ b/src/main/java/frc4388/robot/RobotMap.java @@ -74,17 +74,17 @@ public class RobotMap { rightBackMotor.setInverted(InvertType.FollowMaster); } /* Horn subsystem */ - public final Solenoid HornSolenoid = new Solenoid(HornConstants.HORN_SOLENOID_ID); + // public final Solenoid HornSolenoid = new Solenoid(HornConstants.HORN_SOLENOID_ID); - /* Shooter subsystem */ - public final Solenoid ShooterSolenoid0 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_0_ID); - public final Solenoid ShooterSolenoid1 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_1_ID); - public final Solenoid ShooterSolenoid2 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_2_ID); - public final Solenoid ShooterSolenoid3 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_3_ID); - public final Solenoid ShooterSolenoid4 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_4_ID); - public final Solenoid ShooterSolenoid5 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_5_ID); - public final Solenoid ShooterSolenoid6 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_6_ID); - public final Solenoid ShooterSolenoid7 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_7_ID); + // /* Shooter subsystem */ + // public final Solenoid ShooterSolenoid0 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_0_ID); + // public final Solenoid ShooterSolenoid1 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_1_ID); + // public final Solenoid ShooterSolenoid2 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_2_ID); + // public final Solenoid ShooterSolenoid3 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_3_ID); + // public final Solenoid ShooterSolenoid4 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_4_ID); + // public final Solenoid ShooterSolenoid5 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_5_ID); + // public final Solenoid ShooterSolenoid6 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_6_ID); + // public final Solenoid ShooterSolenoid7 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_7_ID); /* DPrint Utility */ public final DPrint DPrinter = new DPrint(DebugConstants.TYPE_INFO);