Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +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
wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
View File

@@ -88,7 +88,7 @@ void Compressor::InitSendable(wpi::util::SendableBuilder& builder) {
builder.AddDoubleProperty(
"Current (A)", [this] { return GetCurrent().value(); }, nullptr);
// These are not supported by the CTRE PCM
if (m_moduleType == PneumaticsModuleType::REVPH) {
if (m_moduleType == PneumaticsModuleType::REV_PH) {
builder.AddDoubleProperty(
"Analog Voltage", [this] { return GetAnalogVoltage().value(); },
nullptr);

6
wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
View File

@@ -419,17 +419,17 @@ wpi::units::pounds_per_square_inch_t PneumaticHub::GetPressure(
}
Solenoid PneumaticHub::MakeSolenoid(int channel) {
return Solenoid{m_module, PneumaticsModuleType::REVPH, channel};
return Solenoid{m_module, PneumaticsModuleType::REV_PH, channel};
}
DoubleSolenoid PneumaticHub::MakeDoubleSolenoid(int forwardChannel,
int reverseChannel) {
return DoubleSolenoid{m_module, PneumaticsModuleType::REVPH, forwardChannel,
return DoubleSolenoid{m_module, PneumaticsModuleType::REV_PH, forwardChannel,
reverseChannel};
}
Compressor PneumaticHub::MakeCompressor() {
return Compressor{m_module, PneumaticsModuleType::REVPH};
return Compressor{m_module, PneumaticsModuleType::REV_PH};
}
void PneumaticHub::ReportUsage(std::string_view device, std::string_view data) {

8
wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
View File

@@ -29,9 +29,9 @@ static_assert(
std::shared_ptr<PneumaticsBase> PneumaticsBase::GetForType(
int busId, int module, PneumaticsModuleType moduleType) {
if (moduleType == PneumaticsModuleType::CTREPCM) {
if (moduleType == PneumaticsModuleType::CTRE_PCM) {
return PneumaticsControlModule::GetForModule(busId, module);
} else if (moduleType == PneumaticsModuleType::REVPH) {
} else if (moduleType == PneumaticsModuleType::REV_PH) {
return PneumaticHub::GetForModule(busId, module);
}
throw WPILIB_MakeError(err::InvalidParameter, "{}",
@@ -39,9 +39,9 @@ std::shared_ptr<PneumaticsBase> PneumaticsBase::GetForType(
}
int PneumaticsBase::GetDefaultForType(PneumaticsModuleType moduleType) {
if (moduleType == PneumaticsModuleType::CTREPCM) {
if (moduleType == PneumaticsModuleType::CTRE_PCM) {
return SensorUtil::GetDefaultCTREPCMModule();
} else if (moduleType == PneumaticsModuleType::REVPH) {
} else if (moduleType == PneumaticsModuleType::REV_PH) {
return SensorUtil::GetDefaultREVPHModule();
}
throw WPILIB_MakeError(err::InvalidParameter, "{}",

8
wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
View File

@@ -286,17 +286,17 @@ wpi::units::pounds_per_square_inch_t PneumaticsControlModule::GetPressure(
}
Solenoid PneumaticsControlModule::MakeSolenoid(int channel) {
return Solenoid{m_module, PneumaticsModuleType::CTREPCM, channel};
return Solenoid{m_module, PneumaticsModuleType::CTRE_PCM, channel};
}
DoubleSolenoid PneumaticsControlModule::MakeDoubleSolenoid(int forwardChannel,
int reverseChannel) {
return DoubleSolenoid{m_module, PneumaticsModuleType::CTREPCM, forwardChannel,
reverseChannel};
return DoubleSolenoid{m_module, PneumaticsModuleType::CTRE_PCM,
forwardChannel, reverseChannel};
}
Compressor PneumaticsControlModule::MakeCompressor() {
return Compressor{m_module, PneumaticsModuleType::CTREPCM};
return Compressor{m_module, PneumaticsModuleType::CTRE_PCM};
}
void PneumaticsControlModule::ReportUsage(std::string_view device,

4
wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
View File

@@ -17,10 +17,10 @@ using namespace wpi::sim;
std::shared_ptr<PneumaticsBaseSim> PneumaticsBaseSim::GetForType(
int module, PneumaticsModuleType type) {
switch (type) {
case PneumaticsModuleType::REVPH:
case PneumaticsModuleType::REV_PH:
return std::make_shared<REVPHSim>(module);
case PneumaticsModuleType::CTREPCM:
case PneumaticsModuleType::CTRE_PCM:
return std::make_shared<CTREPCMSim>(module);
default:

4
wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsModuleType.hpp
View File

@@ -10,8 +10,8 @@ namespace wpi {
*/
enum class PneumaticsModuleType {
/// CTRE PCM.
CTREPCM,
CTRE_PCM,
/// REV PH.
REVPH
REV_PH
};
} // namespace wpi

28
wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
View File

@@ -11,7 +11,7 @@
namespace wpi {
TEST(DoubleSolenoidCTRETest, ValidInitialization) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3};
solenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
@@ -24,29 +24,29 @@ TEST(DoubleSolenoidCTRETest, ValidInitialization) {
TEST(DoubleSolenoidCTRETest, ThrowForwardPortAlreadyInitialized) {
// Single solenoid that is reused for forward port
Solenoid solenoid{0, 5, wpi::PneumaticsModuleType::CTREPCM, 2};
EXPECT_THROW(DoubleSolenoid(0, 5, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid{0, 5, wpi::PneumaticsModuleType::CTRE_PCM, 2};
EXPECT_THROW(DoubleSolenoid(0, 5, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidCTRETest, ThrowReversePortAlreadyInitialized) {
// Single solenoid that is reused for forward port
Solenoid solenoid{0, 6, wpi::PneumaticsModuleType::CTREPCM, 3};
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid{0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 3};
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidCTRETest, ThrowBothPortsAlreadyInitialized) {
PneumaticsControlModule pcm{0, 6};
// Single solenoid that is reused for forward port
Solenoid solenoid0(0, 6, wpi::PneumaticsModuleType::CTREPCM, 2);
Solenoid solenoid1(0, 6, wpi::PneumaticsModuleType::CTREPCM, 3);
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid0(0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 2);
Solenoid solenoid1(0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 3);
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidCTRETest, Toggle) {
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3};
// Bootstrap it into reverse
solenoid.Set(DoubleSolenoid::REVERSE);
@@ -63,12 +63,14 @@ TEST(DoubleSolenoidCTRETest, Toggle) {
}
TEST(DoubleSolenoidCTRETest, InvalidForwardPort) {
EXPECT_THROW(DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTREPCM, 100, 1),
std::runtime_error);
EXPECT_THROW(
DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTRE_PCM, 100, 1),
std::runtime_error);
}
TEST(DoubleSolenoidCTRETest, InvalidReversePort) {
EXPECT_THROW(DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTREPCM, 0, 100),
std::runtime_error);
EXPECT_THROW(
DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTRE_PCM, 0, 100),
std::runtime_error);
}
} // namespace wpi

28
wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
View File

@@ -11,7 +11,7 @@
namespace wpi {
TEST(DoubleSolenoidREVTest, ValidInitialization) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3};
solenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
@@ -24,29 +24,29 @@ TEST(DoubleSolenoidREVTest, ValidInitialization) {
TEST(DoubleSolenoidREVTest, ThrowForwardPortAlreadyInitialized) {
// Single solenoid that is reused for forward port
Solenoid solenoid{0, 5, wpi::PneumaticsModuleType::CTREPCM, 2};
EXPECT_THROW(DoubleSolenoid(5, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid{0, 5, wpi::PneumaticsModuleType::CTRE_PCM, 2};
EXPECT_THROW(DoubleSolenoid(5, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidREVTest, ThrowReversePortAlreadyInitialized) {
// Single solenoid that is reused for forward port
Solenoid solenoid{0, 6, wpi::PneumaticsModuleType::CTREPCM, 3};
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid{0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 3};
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidREVTest, ThrowBothPortsAlreadyInitialized) {
PneumaticsControlModule pcm{0, 6};
// Single solenoid that is reused for forward port
Solenoid solenoid0(0, 6, wpi::PneumaticsModuleType::CTREPCM, 2);
Solenoid solenoid1(0, 6, wpi::PneumaticsModuleType::CTREPCM, 3);
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTREPCM, 2, 3),
Solenoid solenoid0(0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 2);
Solenoid solenoid1(0, 6, wpi::PneumaticsModuleType::CTRE_PCM, 3);
EXPECT_THROW(DoubleSolenoid(6, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3),
std::runtime_error);
}
TEST(DoubleSolenoidREVTest, Toggle) {
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3};
// Bootstrap it into reverse
solenoid.Set(DoubleSolenoid::REVERSE);
@@ -63,12 +63,14 @@ TEST(DoubleSolenoidREVTest, Toggle) {
}
TEST(DoubleSolenoidREVTest, InvalidForwardPort) {
EXPECT_THROW(DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTREPCM, 100, 1),
std::runtime_error);
EXPECT_THROW(
DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTRE_PCM, 100, 1),
std::runtime_error);
}
TEST(DoubleSolenoidREVTest, InvalidReversePort) {
EXPECT_THROW(DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTREPCM, 0, 100),
std::runtime_error);
EXPECT_THROW(
DoubleSolenoid(0, 0, wpi::PneumaticsModuleType::CTRE_PCM, 0, 100),
std::runtime_error);
}
} // namespace wpi

14
wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
View File

@@ -9,7 +9,7 @@
namespace wpi {
TEST(SolenoidCTRETest, ValidInitialization) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2};
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2};
EXPECT_EQ(2, solenoid.GetChannel());
solenoid.Set(true);
@@ -20,24 +20,24 @@ TEST(SolenoidCTRETest, ValidInitialization) {
}
TEST(SolenoidCTRETest, DoubleInitialization) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTREPCM, 2),
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2),
std::runtime_error);
}
TEST(SolenoidCTRETest, DoubleInitializationFromDoubleSolenoid) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTREPCM, 2),
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2, 3};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2),
std::runtime_error);
}
TEST(SolenoidCTRETest, InvalidChannel) {
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTREPCM, 100),
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 100),
std::runtime_error);
}
TEST(SolenoidCTRETest, Toggle) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2};
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTRE_PCM, 2};
solenoid.Set(true);
EXPECT_TRUE(solenoid.Get());

14
wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
View File

@@ -9,7 +9,7 @@
namespace wpi {
TEST(SolenoidREVTest, ValidInitialization) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REVPH, 2};
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REV_PH, 2};
EXPECT_EQ(2, solenoid.GetChannel());
solenoid.Set(true);
@@ -20,24 +20,24 @@ TEST(SolenoidREVTest, ValidInitialization) {
}
TEST(SolenoidREVTest, DoubleInitialization) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REVPH, 2};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REVPH, 2),
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REV_PH, 2};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REV_PH, 2),
std::runtime_error);
}
TEST(SolenoidREVTest, DoubleInitializationFromDoubleSolenoid) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::REVPH, 2, 3};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REVPH, 2),
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::REV_PH, 2, 3};
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REV_PH, 2),
std::runtime_error);
}
TEST(SolenoidREVTest, InvalidChannel) {
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REVPH, 100),
EXPECT_THROW(Solenoid(0, 3, wpi::PneumaticsModuleType::REV_PH, 100),
std::runtime_error);
}
TEST(SolenoidREVTest, Toggle) {
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REVPH, 2};
Solenoid solenoid{0, 3, wpi::PneumaticsModuleType::REV_PH, 2};
solenoid.Set(true);
EXPECT_TRUE(solenoid.Get());

2
wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
View File

@@ -32,7 +32,7 @@ TEST(CTREPCMSimTest, SolenoidOutput) {
CTREPCMSim sim(pcm);
sim.ResetData();
DoubleSolenoid doubleSolenoid{0, wpi::PneumaticsModuleType::CTREPCM, 3, 4};
DoubleSolenoid doubleSolenoid{0, wpi::PneumaticsModuleType::CTRE_PCM, 3, 4};
BooleanCallback callback3;
BooleanCallback callback4;

2
wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
View File

@@ -32,7 +32,7 @@ TEST(REVPHSimTest, SolenoidOutput) {
REVPHSim sim(ph);
sim.ResetData();
DoubleSolenoid doubleSolenoid{0, 1, wpi::PneumaticsModuleType::REVPH, 3, 4};
DoubleSolenoid doubleSolenoid{0, 1, wpi::PneumaticsModuleType::REV_PH, 3, 4};
BooleanCallback callback3;
BooleanCallback callback4;