Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilib] Rename DoubleSolenoid.Value constants to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-17 17:10:58 -07:00
parent c5738fcbad
commit d86a745328
32 changed files with 155 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
View File

@@ -72,13 +72,13 @@ void DoubleSolenoid::Set(Value value) {
int setValue = 0;
switch (value) {
case kOff:
case OFF:
setValue = 0;
break;
case kForward:
case FORWARD:
setValue = m_forwardMask;
break;
case kReverse:
case REVERSE:
setValue = m_reverseMask;
break;
}
@@ -90,21 +90,21 @@ DoubleSolenoid::Value DoubleSolenoid::Get() const {
auto values = m_module->GetSolenoids();
if ((values & m_forwardMask) != 0) {
return Value::kForward;
return Value::FORWARD;
} else if ((values & m_reverseMask) != 0) {
return Value::kReverse;
return Value::REVERSE;
} else {
return Value::kOff;
return Value::OFF;
}
}
void DoubleSolenoid::Toggle() {
Value value = Get();
if (value == kForward) {
Set(kReverse);
} else if (value == kReverse) {
Set(kForward);
if (value == FORWARD) {
Set(REVERSE);
} else if (value == REVERSE) {
Set(FORWARD);
}
}
@@ -131,20 +131,20 @@ void DoubleSolenoid::InitSendable(wpi::util::SendableBuilder& builder) {
"Value",
[=, this](wpi::util::SmallVectorImpl<char>& buf) -> std::string_view {
switch (Get()) {
case kForward:
case FORWARD:
return "Forward";
case kReverse:
case REVERSE:
return "Reverse";
default:
return "Off";
}
},
[=, this](std::string_view value) {
Value lvalue = kOff;
Value lvalue = OFF;
if (value == "Forward") {
lvalue = kForward;
lvalue = FORWARD;
} else if (value == "Reverse") {
lvalue = kReverse;
lvalue = REVERSE;
}
Set(lvalue);
});

10
wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.cpp
View File

@@ -33,17 +33,17 @@ DoubleSolenoid::Value DoubleSolenoidSim::Get() const {
bool fwdState = m_module->GetSolenoidOutput(m_fwd);
bool revState = m_module->GetSolenoidOutput(m_rev);
if (fwdState && !revState) {
return DoubleSolenoid::Value::kForward;
return DoubleSolenoid::Value::FORWARD;
} else if (!fwdState && revState) {
return DoubleSolenoid::Value::kReverse;
return DoubleSolenoid::Value::REVERSE;
} else {
return DoubleSolenoid::Value::kOff;
return DoubleSolenoid::Value::OFF;
}
}
void DoubleSolenoidSim::Set(DoubleSolenoid::Value output) {
m_module->SetSolenoidOutput(m_fwd, output == DoubleSolenoid::Value::kForward);
m_module->SetSolenoidOutput(m_rev, output == DoubleSolenoid::Value::kReverse);
m_module->SetSolenoidOutput(m_fwd, output == DoubleSolenoid::Value::FORWARD);
m_module->SetSolenoidOutput(m_rev, output == DoubleSolenoid::Value::REVERSE);
}
std::shared_ptr<PneumaticsBaseSim> DoubleSolenoidSim::GetModuleSim() const {

6
wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
View File

@@ -29,11 +29,11 @@ class DoubleSolenoid : public wpi::util::Sendable,
*/
enum Value {
/// Off position.
kOff,
OFF,
/// Forward position.
kForward,
FORWARD,
/// Reverse position.
kReverse
REVERSE
};
/**

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

@@ -12,14 +12,14 @@ namespace wpi {
TEST(DoubleSolenoidCTRETest, ValidInitialization) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
solenoid.Set(DoubleSolenoid::kReverse);
EXPECT_EQ(DoubleSolenoid::kReverse, solenoid.Get());
solenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
solenoid.Set(DoubleSolenoid::kForward);
EXPECT_EQ(DoubleSolenoid::kForward, solenoid.Get());
solenoid.Set(DoubleSolenoid::FORWARD);
EXPECT_EQ(DoubleSolenoid::FORWARD, solenoid.Get());
solenoid.Set(DoubleSolenoid::kOff);
EXPECT_EQ(DoubleSolenoid::kOff, solenoid.Get());
solenoid.Set(DoubleSolenoid::OFF);
EXPECT_EQ(DoubleSolenoid::OFF, solenoid.Get());
}
TEST(DoubleSolenoidCTRETest, ThrowForwardPortAlreadyInitialized) {
@@ -48,18 +48,18 @@ TEST(DoubleSolenoidCTRETest, ThrowBothPortsAlreadyInitialized) {
TEST(DoubleSolenoidCTRETest, Toggle) {
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
// Bootstrap it into reverse
solenoid.Set(DoubleSolenoid::kReverse);
solenoid.Set(DoubleSolenoid::REVERSE);
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kForward, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::FORWARD, solenoid.Get());
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kReverse, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
// Of shouldn't do anything on toggle
solenoid.Set(DoubleSolenoid::kOff);
solenoid.Set(DoubleSolenoid::OFF);
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kOff, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::OFF, solenoid.Get());
}
TEST(DoubleSolenoidCTRETest, InvalidForwardPort) {

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

@@ -12,14 +12,14 @@ namespace wpi {
TEST(DoubleSolenoidREVTest, ValidInitialization) {
DoubleSolenoid solenoid{0, 3, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
solenoid.Set(DoubleSolenoid::kReverse);
EXPECT_EQ(DoubleSolenoid::kReverse, solenoid.Get());
solenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
solenoid.Set(DoubleSolenoid::kForward);
EXPECT_EQ(DoubleSolenoid::kForward, solenoid.Get());
solenoid.Set(DoubleSolenoid::FORWARD);
EXPECT_EQ(DoubleSolenoid::FORWARD, solenoid.Get());
solenoid.Set(DoubleSolenoid::kOff);
EXPECT_EQ(DoubleSolenoid::kOff, solenoid.Get());
solenoid.Set(DoubleSolenoid::OFF);
EXPECT_EQ(DoubleSolenoid::OFF, solenoid.Get());
}
TEST(DoubleSolenoidREVTest, ThrowForwardPortAlreadyInitialized) {
@@ -48,18 +48,18 @@ TEST(DoubleSolenoidREVTest, ThrowBothPortsAlreadyInitialized) {
TEST(DoubleSolenoidREVTest, Toggle) {
DoubleSolenoid solenoid{0, 4, wpi::PneumaticsModuleType::CTREPCM, 2, 3};
// Bootstrap it into reverse
solenoid.Set(DoubleSolenoid::kReverse);
solenoid.Set(DoubleSolenoid::REVERSE);
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kForward, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::FORWARD, solenoid.Get());
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kReverse, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::REVERSE, solenoid.Get());
// Of shouldn't do anything on toggle
solenoid.Set(DoubleSolenoid::kOff);
solenoid.Set(DoubleSolenoid::OFF);
solenoid.Toggle();
EXPECT_EQ(DoubleSolenoid::kOff, solenoid.Get());
EXPECT_EQ(DoubleSolenoid::OFF, solenoid.Get());
}
TEST(DoubleSolenoidREVTest, InvalidForwardPort) {

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

@@ -43,7 +43,7 @@ TEST(CTREPCMSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kReverse);
doubleSolenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_FALSE(callback3.WasTriggered());
EXPECT_FALSE(callback3.GetLastValue());
EXPECT_TRUE(callback4.WasTriggered());
@@ -55,7 +55,7 @@ TEST(CTREPCMSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kForward);
doubleSolenoid.Set(DoubleSolenoid::FORWARD);
EXPECT_TRUE(callback3.WasTriggered());
EXPECT_TRUE(callback3.GetLastValue());
EXPECT_TRUE(callback4.WasTriggered());
@@ -67,7 +67,7 @@ TEST(CTREPCMSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kOff);
doubleSolenoid.Set(DoubleSolenoid::OFF);
EXPECT_TRUE(callback3.WasTriggered());
EXPECT_FALSE(callback3.GetLastValue());
EXPECT_FALSE(callback4.WasTriggered());

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

@@ -43,7 +43,7 @@ TEST(REVPHSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kReverse);
doubleSolenoid.Set(DoubleSolenoid::REVERSE);
EXPECT_FALSE(callback3.WasTriggered());
EXPECT_FALSE(callback3.GetLastValue());
EXPECT_TRUE(callback4.WasTriggered());
@@ -55,7 +55,7 @@ TEST(REVPHSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kForward);
doubleSolenoid.Set(DoubleSolenoid::FORWARD);
EXPECT_TRUE(callback3.WasTriggered());
EXPECT_TRUE(callback3.GetLastValue());
EXPECT_TRUE(callback4.WasTriggered());
@@ -67,7 +67,7 @@ TEST(REVPHSimTest, SolenoidOutput) {
callback3.Reset();
callback4.Reset();
doubleSolenoid.Set(DoubleSolenoid::kOff);
doubleSolenoid.Set(DoubleSolenoid::OFF);
EXPECT_TRUE(callback3.WasTriggered());
EXPECT_FALSE(callback3.GetLastValue());
EXPECT_FALSE(callback4.WasTriggered());