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

[hal] Fix HAL AllianceStation on rio (#5811)

Browse Source
This commit is contained in:
Thad House
2023-10-23 21:32:21 -07:00
committed by GitHub
parent 196d963dc4
commit 3f08bcde54
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hal/src/main/native/athena/FRCDriverStation.cpp
View File

@@ -102,8 +102,11 @@ void JoystickDataCache::Update() {
HAL_GetJoystickPOVsInternal(i, &povs[i]);
HAL_GetJoystickButtonsInternal(i, &buttons[i]);
}
FRC_NetworkCommunication_getAllianceStation(
reinterpret_cast<AllianceStationID_t*>(&allianceStation));
AllianceStationID_t alliance = kAllianceStationID_red1;
FRC_NetworkCommunication_getAllianceStation(&alliance);
int allianceInt = alliance;
allianceInt += 1;
allianceStation = static_cast<HAL_AllianceStationID>(allianceInt);
FRC_NetworkCommunication_getMatchTime(&matchTime);
FRC_NetworkCommunication_getControlWord(
reinterpret_cast<ControlWord_t*>(&controlWord));

2
hal/src/main/native/sim/DriverStation.cpp
View File

@@ -194,7 +194,7 @@ int32_t HAL_GetControlWord(HAL_ControlWord* controlWord) {
HAL_AllianceStationID HAL_GetAllianceStation(int32_t* status) {
if (gShutdown) {
return HAL_AllianceStationID_kRed1;
return HAL_AllianceStationID_kUnknown;
}
std::scoped_lock lock{driverStation->cacheMutex};
return currentRead->allianceStation;