Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Rename PneumaticsModuleType constants

Browse Source
This commit is contained in:
Peter Johnson
2026-03-19 21:32:48 -07:00
parent f060c98992
commit ea32c247db
44 changed files with 142 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibj/src/main/java/org/wpilib/hardware/pneumatic/Compressor.java
View File

@@ -197,7 +197,7 @@ public class Compressor implements Sendable, AutoCloseable {
builder.addBooleanProperty("Enabled", this::isEnabled, null);
builder.addBooleanProperty("Pressure switch", this::getPressureSwitchValue, null);
builder.addDoubleProperty("Current (A)", this::getCurrent, null);
if (m_moduleType == PneumaticsModuleType.REVPH) { // These are not supported by the CTRE PCM
if (m_moduleType == PneumaticsModuleType.REV_PH) { // These are not supported by the CTRE PCM
builder.addDoubleProperty("Analog Voltage", this::getAnalogVoltage, null);
builder.addDoubleProperty("Pressure (PSI)", this::getPressure, null);
}

6
wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticHub.java
View File

@@ -201,18 +201,18 @@ public class PneumaticHub implements PneumaticsBase {
@Override
public Solenoid makeSolenoid(int channel) {
return new Solenoid(m_dataStore.m_module, PneumaticsModuleType.REVPH, channel);
return new Solenoid(m_dataStore.m_module, PneumaticsModuleType.REV_PH, channel);
}
@Override
public DoubleSolenoid makeDoubleSolenoid(int forwardChannel, int reverseChannel) {
return new DoubleSolenoid(
m_dataStore.m_module, PneumaticsModuleType.REVPH, forwardChannel, reverseChannel);
m_dataStore.m_module, PneumaticsModuleType.REV_PH, forwardChannel, reverseChannel);
}
@Override
public Compressor makeCompressor() {
return new Compressor(m_dataStore.m_module, PneumaticsModuleType.REVPH);
return new Compressor(m_dataStore.m_module, PneumaticsModuleType.REV_PH);
}
@Override

8
wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsBase.java
View File

@@ -18,8 +18,8 @@ public interface PneumaticsBase extends AutoCloseable {
*/
static PneumaticsBase getForType(int busId, int module, PneumaticsModuleType type) {
return switch (type) {
case CTREPCM -> new PneumaticsControlModule(busId, module);
case REVPH -> new PneumaticHub(busId, module);
case CTRE_PCM -> new PneumaticsControlModule(busId, module);
case REV_PH -> new PneumaticHub(busId, module);
};
}
@@ -31,8 +31,8 @@ public interface PneumaticsBase extends AutoCloseable {
*/
static int getDefaultForType(PneumaticsModuleType type) {
return switch (type) {
case CTREPCM -> SensorUtil.getDefaultCTREPCMModule();
case REVPH -> SensorUtil.getDefaultREVPHModule();
case CTRE_PCM -> SensorUtil.getDefaultCTREPCMModule();
case REV_PH -> SensorUtil.getDefaultREVPHModule();
};
}

6
wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsControlModule.java
View File

@@ -265,18 +265,18 @@ public class PneumaticsControlModule implements PneumaticsBase {
@Override
public Solenoid makeSolenoid(int channel) {
return new Solenoid(m_dataStore.m_module, PneumaticsModuleType.CTREPCM, channel);
return new Solenoid(m_dataStore.m_module, PneumaticsModuleType.CTRE_PCM, channel);
}
@Override
public DoubleSolenoid makeDoubleSolenoid(int forwardChannel, int reverseChannel) {
return new DoubleSolenoid(
m_dataStore.m_module, PneumaticsModuleType.CTREPCM, forwardChannel, reverseChannel);
m_dataStore.m_module, PneumaticsModuleType.CTRE_PCM, forwardChannel, reverseChannel);
}
@Override
public Compressor makeCompressor() {
return new Compressor(m_dataStore.m_module, PneumaticsModuleType.CTREPCM);
return new Compressor(m_dataStore.m_module, PneumaticsModuleType.CTRE_PCM);
}
@Override

4
wpilibj/src/main/java/org/wpilib/hardware/pneumatic/PneumaticsModuleType.java
View File

@@ -7,7 +7,7 @@ package org.wpilib.hardware.pneumatic;
/** Pneumatics module type. */
public enum PneumaticsModuleType {
/** CTRE PCM. */
CTREPCM,
CTRE_PCM,
/** REV PH. */
REVPH
REV_PH
}

4
wpilibj/src/main/java/org/wpilib/simulation/PneumaticsBaseSim.java
View File

@@ -22,8 +22,8 @@ public abstract class PneumaticsBaseSim {
*/
public static PneumaticsBaseSim getForType(int module, PneumaticsModuleType type) {
return switch (type) {
case CTREPCM -> new CTREPCMSim(module);
case REVPH -> new REVPHSim(module);
case CTRE_PCM -> new CTREPCMSim(module);
case REV_PH -> new REVPHSim(module);
};
}