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

[wpilib] Rename DriverStation::IsOperatorControl() to IsTeleop() (#3505)

Browse Source
This commit is contained in:
Tyler Veness
2021-08-11 23:04:43 -07:00
committed by GitHub
parent e80f09f849
commit 25f6f478a5
12 changed files with 162 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibc/src/main/native/cpp/DriverStation.cpp
View File

@@ -462,12 +462,20 @@ bool DriverStation::IsAutonomousEnabled() {
}
bool DriverStation::IsOperatorControl() {
return IsTeleop();
}
bool DriverStation::IsTeleop() {
HAL_ControlWord controlWord;
HAL_GetControlWord(&controlWord);
return !(controlWord.autonomous || controlWord.test);
}
bool DriverStation::IsOperatorControlEnabled() {
return IsTeleopEnabled();
}
bool DriverStation::IsTeleopEnabled() {
HAL_ControlWord controlWord;
HAL_GetControlWord(&controlWord);
return !controlWord.autonomous && !controlWord.test && controlWord.enabled;
@@ -621,6 +629,10 @@ void DriverStation::InAutonomous(bool entering) {
}
void DriverStation::InOperatorControl(bool entering) {
InTeleop(entering);
}
void DriverStation::InTeleop(bool entering) {
::GetInstance().userInTeleop = entering;
}