Team4388/Shirt-Cannon
1
0
Fork 0
mirror of https://github.com/Team4388/Shirt-Cannon.git synced 2026-06-09 00:28:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

HotWire Fixes prt2 cus code didnt push everything

Browse Source
This commit is contained in:
C4llSiqn
2023-04-26 11:43:57 -06:00
parent 7ea99b9af2
commit cc05e186cd
4 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -1,6 +1,6 @@
plugins { plugins {
id "java" id "java"
id "edu.wpi.first.GradleRIO" version "2022.4.1" id "edu.wpi.first.GradleRIO" version "2023.3.2"
} }
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
src/main/java/frc4388/robot/Constants.java
+17 -8
View File
@@ -18,14 +18,22 @@ public final class Constants {
} }
public static final class ShooterConstants { public static final class ShooterConstants {
public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID = 1; public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_ID = 0;
public static final int SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID = 2; public static final int SHOOTER_SOLENOID_BOTTOM_MIDDLE_ID = 1;
public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID = 3; public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_ID = 2;
public static final int SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID = 4; public static final int SHOOTER_SOLENOID_TOP_LEFT_ID = 3;
public static final int SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID = 5; public static final int SHOOTER_SOLENOID_TOP_MIDDLE_ID = 4;
public static final int SHOOTER_SOLENOID_TOP_LEFT_INNER_ID = 6; public static final int SHOOTER_SOLENOID_TOP_RIGHT_ID = 5;
public static final int SHOOTER_SOLENOID_TOP_RIGHT_INNER_ID = 7; // Will most likely need rebinding for the 6 barrel setup
public static final int SHOOTER_SOLENOID_TOP_RIGHT_OUTER_ID = 8;
// 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 { public static final class HornConstants {
@@ -34,5 +42,6 @@ public final class Constants {
public static final class OIConstants { public static final class OIConstants {
public static final int CONTROLLER_ID = 0; public static final int CONTROLLER_ID = 0;
// Odd, This robot supports single person operation and driving.
} }
} }
src/main/java/frc4388/robot/Robot.java
+3
View File
@@ -28,6 +28,8 @@ public class Robot extends TimedRobot {
/** Initialization code for disabled mode should go here. */ /** Initialization code for disabled mode should go here. */
@Override @Override
public void disabledInit() { 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. */ /** 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. */ /** Periodic code for teleop mode should go here. */
@Override @Override
public void teleopPeriodic() { public void teleopPeriodic() {
m_robotContainer.putReadyState();
} }
/** Initialization code for test mode should go here. */ /** Initialization code for test mode should go here. */
src/main/java/frc4388/robot/RobotMap.java
+16 -9
View File
@@ -54,17 +54,24 @@ public class RobotMap {
} }
/* Horn Subsystem */ /* 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 */ /* Shooter Subsystem */
public final Solenoid shooterSolenoidBottomLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_OUTER_ID); public final Solenoid shooterSolenoidBottomLeft = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_ID);
public final Solenoid shooterSolenoidBottomLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_LEFT_INNER_ID); public final Solenoid shooterSolenoidBottomMiddle = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_MIDDLE_ID);
public final Solenoid shooterSolenoidBottomRightInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_INNER_ID); public final Solenoid shooterSolenoidBottomRight = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_ID);
public final Solenoid shooterSolenoidBottomRightOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_BOTTOM_RIGHT_OUTER_ID); public final Solenoid shooterSolenoidTopLeft = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_ID);
public final Solenoid shooterSolenoidTopLeftOuter = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_OUTER_ID); public final Solenoid shooterSolenoidTopMiddle = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_MIDDLE_ID);
public final Solenoid shooterSolenoidTopLeftInner = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_LEFT_INNER_ID); public final Solenoid shooterSolenoidTopRight = new Solenoid(PneumaticsModuleType.REVPH, SHOOTER_SOLENOID_TOP_RIGHT_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 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() { private void configureLiveWindow() {