Skip to content

Commit 609fa15

Browse files
fix bug with duplicate pneumatics hub usages
1 parent 3d0dd11 commit 609fa15

File tree

7 files changed

+47
-482
lines changed

7 files changed

+47
-482
lines changed

src/main/java/frc/robot/Constants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private Constants() {}
2020

2121
public static final boolean SHOW_SYS_ID_AUTOS = false;
2222

23-
private static RobotType robotType = RobotType.SIM_BOT;
23+
private static RobotType robotType = RobotType.TEST_BOT;
2424

2525
public static RobotType getRobot() {
2626
if (RobotBase.isReal() && robotType == RobotType.SIM_BOT) {

src/main/java/frc/robot/RobotContainer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public RobotContainer() {
9696
gatewayTank = new GatewayTank(new GatewayIOHardware());
9797
firingTube =
9898
new FiringTube(
99-
new CannonIOHardware(CannonConstants.MIDDLE_FIRING_TUBE_SOLENOID_CHANNEL), "Main");
99+
new CannonIOHardware(CannonConstants.MIDDLE_FIRING_TUBE_SOLENOID_CHANNEL),
100+
"Main");
100101
break;
101102

102103
case SIM_BOT:
@@ -124,8 +125,8 @@ public RobotContainer() {
124125
new ModuleIO() {},
125126
new ModuleIO() {});
126127
vision = new AprilTagVision();
127-
reservoirTank = new ReservoirTank(new ReservoirIOHardware() {});
128-
gatewayTank = new GatewayTank(new GatewayIO() {});
128+
reservoirTank = new ReservoirTank(new ReservoirIO() {});
129+
gatewayTank = new GatewayTank(new GatewayIOHardware());
129130
firingTube = new FiringTube(new CannonIO() {}, "Main");
130131
break;
131132

@@ -460,8 +461,7 @@ private void configureOperatorControllerBindings() {
460461
final CommandXboxController operatorXbox = (CommandXboxController) operatorController;
461462

462463
// TODO, this should be the other way around, pressing buttons should put command that pause
463-
// the filling
464-
// and in general more commands should be used to greatly simplify code.
464+
// the filling and in general more commands should be used to greatly simplify code.
465465

466466
reservoirTank.addPauseFillingCondition(operatorXbox.y(), "Operator Y Button", 0);
467467

0 commit comments

Comments
 (0)