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

[wpilibc] Fix "control reaches end of non-void function" warning (#3324)

Browse Source
This commit is contained in:
Tyler Veness
2021-05-01 07:05:21 -07:00
committed by GitHub
parent f99f62bee4
commit 65c148536d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wpilibc/src/main/native/cpp/Relay.cpp
View File

@@ -143,37 +143,40 @@ void Relay::Set(Relay::Value value) {
}
Relay::Value Relay::Get() const {
Relay::Value value = kOff;
int32_t status;
if (m_direction == kForwardOnly) {
if (HAL_GetRelay(m_forwardHandle, &status)) {
return kOn;
value = kOn;
} else {
return kOff;
value = kOff;
}
} else if (m_direction == kReverseOnly) {
if (HAL_GetRelay(m_reverseHandle, &status)) {
return kOn;
value = kOn;
} else {
return kOff;
value = kOff;
}
} else {
if (HAL_GetRelay(m_forwardHandle, &status)) {
if (HAL_GetRelay(m_reverseHandle, &status)) {
return kOn;
value = kOn;
} else {
return kForward;
value = kForward;
}
} else {
if (HAL_GetRelay(m_reverseHandle, &status)) {
return kReverse;
value = kReverse;
} else {
return kOff;
value = kOff;
}
}
}
wpi_setHALError(status);
return value;
}
int Relay::GetChannel() const {