From cc05e186cd16bd00c6487e5e631beca983da0b26 Mon Sep 17 00:00:00 2001 From: C4llSiqn Date: Wed, 26 Apr 2023 11:43:57 -0600 Subject: [PATCH] HotWire Fixes prt2 cus code didnt push everything --- build.gradle | 2 +- src/main/java/frc4388/robot/Constants.java | 25 +++++++++++++++------- src/main/java/frc4388/robot/Robot.java | 3 +++ src/main/java/frc4388/robot/RobotMap.java | 25 ++++++++++++++-------- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index a7d1915..4ac21ef 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2022.4.1" + id "edu.wpi.first.GradleRIO" version "2023.3.2" } sourceCompatibility = JavaVersion.VERSION_11 diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index 4f5a543..95faaf0 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -18,14 +18,22 @@ public final class Constants { } public static final class ShooterConstants { - public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID = 1; - public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID = 2; - public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID = 3; - public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID = 4; - public static final int SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID = 5; - public static final int SHOOTER_SOLENOID_TOP_LEFT_INNER_ID = 6; - public static final int SHOOTER_SOLENOID_TOP_RIGHT_INNER_ID = 7; - public static final int SHOOTER_SOLENOID_TOP_RIGHT_OUTER_ID = 8; + public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_ID = 0; + public static final int SHOOTER_SOLENOID_BOTTOM_MIDDLE_ID = 1; + public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_ID = 2; + public static final int SHOOTER_SOLENOID_TOP_LEFT_ID = 3; + public static final int SHOOTER_SOLENOID_TOP_MIDDLE_ID = 4; + public static final int SHOOTER_SOLENOID_TOP_RIGHT_ID = 5; + // Will most likely need rebinding for the 6 barrel setup + + // public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID = 1; + // public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID = 2; + // public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID = 3; + // public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID = 4; + // public static final int SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID = 5; + // public static final int SHOOTER_SOLENOID_TOP_LEFT_INNER_ID = 6; + // public static final int SHOOTER_SOLENOID_TOP_RIGHT_INNER_ID = 7; + // public static final int SHOOTER_SOLENOID_TOP_RIGHT_OUTER_ID = 8; } public static final class HornConstants { @@ -34,5 +42,6 @@ public final class Constants { public static final class OIConstants { public static final int CONTROLLER_ID = 0; + // Odd, This robot supports single person operation and driving. } } diff --git a/src/main/java/frc4388/robot/Robot.java b/src/main/java/frc4388/robot/Robot.java index 0bd9ad4..bfd52ee 100644 --- a/src/main/java/frc4388/robot/Robot.java +++ b/src/main/java/frc4388/robot/Robot.java @@ -28,6 +28,8 @@ public class Robot extends TimedRobot { /** Initialization code for disabled mode should go here. */ @Override public void disabledInit() { + m_robotContainer.ResetShooters(); + // automaticly assume that when we dissable we will recharge the shooters } /** Periodic code for disabled mode should go here. */ @@ -53,6 +55,7 @@ public class Robot extends TimedRobot { /** Periodic code for teleop mode should go here. */ @Override public void teleopPeriodic() { + m_robotContainer.putReadyState(); } /** Initialization code for test mode should go here. */ diff --git a/src/main/java/frc4388/robot/RobotMap.java b/src/main/java/frc4388/robot/RobotMap.java index 68c3554..aeeae9b 100644 --- a/src/main/java/frc4388/robot/RobotMap.java +++ b/src/main/java/frc4388/robot/RobotMap.java @@ -54,17 +54,24 @@ public class RobotMap { } /* Horn Subsystem */ - public final Solenoid hornSolenoid = new Solenoid(PneumaticsModuleType.REVPH, HORN_SOLENOID_ID); + //public final Solenoid hornSolenoid = new Solenoid(PneumaticsModuleType.REVPH, HORN_SOLENOID_ID); /* Shooter Subsystem */ - public final Solenoid shooterSolenoidBottomLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID); - public final Solenoid shooterSolenoidBottomLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID); - public final Solenoid shooterSolenoidBottomRightInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID); - public final Solenoid shooterSolenoidBottomRightOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID); - public final Solenoid shooterSolenoidTopLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID); - public final Solenoid shooterSolenoidTopLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_INNER_ID); - public final Solenoid shooterSolenoidTopRightInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_INNER_ID); - public final Solenoid shooterSolenoidTopRightOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_OUTER_ID); + public final Solenoid shooterSolenoidBottomLeft = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_ID); + public final Solenoid shooterSolenoidBottomMiddle = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_MIDDLE_ID); + public final Solenoid shooterSolenoidBottomRight = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_ID); + public final Solenoid shooterSolenoidTopLeft = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_ID); + public final Solenoid shooterSolenoidTopMiddle = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_MIDDLE_ID); + public final Solenoid shooterSolenoidTopRight = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_ID); + + // public final Solenoid shooterSolenoidBottomLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID); + // public final Solenoid shooterSolenoidBottomLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID); + // public final Solenoid shooterSolenoidBottomRightInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID); + // public final Solenoid shooterSolenoidBottomRightOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID); + // public final Solenoid shooterSolenoidTopLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID); + // public final Solenoid shooterSolenoidTopLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_INNER_ID); + // public final Solenoid shooterSolenoidTopRightInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_INNER_ID); + // public final Solenoid shooterSolenoidTopRightOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_OUTER_ID); private void configureLiveWindow() {