This commit is contained in:
Aarav
2023-04-25 17:02:12 -06:00
parent f21e5d981b
commit 1a1d10cbc3
4 changed files with 23 additions and 22 deletions
+3 -2
View File
@@ -1,5 +1,6 @@
#Mon Apr 24 12:32:17 MDT 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=permwrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME distributionPath=permwrapper/dists
zipStorePath=permwrapper/dists zipStorePath=permwrapper/dists
zipStoreBase=GRADLE_USER_HOME
+1 -1
View File
@@ -55,7 +55,7 @@ public final class Constants {
public static final int SHOOTER_SOLENOID_7_ID = 8; public static final int SHOOTER_SOLENOID_7_ID = 8;
} }
public static final class DebugConstants { 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 boolean SHOW_INFO = true;
public static final String TYPE_INFO = "INFO"; public static final String TYPE_INFO = "INFO";
} }
@@ -40,7 +40,7 @@ public class RobotContainer {
private final LED m_robotLED = new LED(m_robotMap.LEDController); 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 /* final code
private final Solenoid[] SolenoidArray = { private final Solenoid[] SolenoidArray = {
m_robotMap.ShooterSolenoid0, m_robotMap.ShooterSolenoid0,
@@ -61,11 +61,6 @@ public class RobotContainer {
new Solenoid(3), new Solenoid(3),
new Solenoid(4), new Solenoid(4),
new Solenoid(5), 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); private final ShootTube m_robotShooter = new ShootTube(SolenoidArray);
@@ -110,15 +105,20 @@ public class RobotContainer {
.whenReleased(() -> m_robotLED.setPattern(LEDConstants.DEFAULT_PATTERN)); .whenReleased(() -> m_robotLED.setPattern(LEDConstants.DEFAULT_PATTERN));
*/ */
/* Fire horn */ /* Fire horn */
new JoystickButton(getOperatorJoystick(), XboxController.LEFT_TRIGGER_AXIS) /*new JoystickButton(getOperatorJoystick(), XboxController.LEFT_TRIGGER_AXIS)
.whenPressed(() -> m_robotHorn.hornSet(true)) .whenPressed(() -> m_robotHorn.hornSet(true))
.whenReleased(() -> m_robotHorn.hornSet(false)); .whenReleased(() -> m_robotHorn.hornSet(false));
*/
/* Shoot T-Shirt, Also cycles the array */ /* 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)) .whenPressed(() -> m_robotShooter.ShootTubeSet(true))
.whenReleased(() -> m_robotShooter.ShootTubeSet(false)); .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 */ /* Cycle Between Solenoids */
new JoystickButton(getOperatorJoystick(), XboxController.LEFT_BUMPER_BUTTON) new JoystickButton(getOperatorJoystick(), XboxController.LEFT_BUMPER_BUTTON)
.whenPressed(() -> m_robotShooter.CycleDown()); .whenPressed(() -> m_robotShooter.CycleDown());
+10 -10
View File
@@ -74,17 +74,17 @@ public class RobotMap {
rightBackMotor.setInverted(InvertType.FollowMaster); rightBackMotor.setInverted(InvertType.FollowMaster);
} }
/* Horn subsystem */ /* Horn subsystem */
public final Solenoid HornSolenoid = new Solenoid(HornConstants.HORN_SOLENOID_ID); // public final Solenoid HornSolenoid = new Solenoid(HornConstants.HORN_SOLENOID_ID);
/* Shooter subsystem */ // /* Shooter subsystem */
public final Solenoid ShooterSolenoid0 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_0_ID); // 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 ShooterSolenoid1 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_1_ID);
public final Solenoid ShooterSolenoid2 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_2_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 ShooterSolenoid3 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_3_ID);
public final Solenoid ShooterSolenoid4 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_4_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 ShooterSolenoid5 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_5_ID);
public final Solenoid ShooterSolenoid6 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_6_ID); // public final Solenoid ShooterSolenoid6 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_6_ID);
public final Solenoid ShooterSolenoid7 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_7_ID); // public final Solenoid ShooterSolenoid7 = new Solenoid(ShooterConstants.SHOOTER_SOLENOID_7_ID);
/* DPrint Utility */ /* DPrint Utility */
public final DPrint DPrinter = new DPrint(DebugConstants.TYPE_INFO); public final DPrint DPrinter = new DPrint(DebugConstants.TYPE_INFO);