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 DIO direction getter (#3445)

Browse Source 
Unset means input, where the code was assuming set means input.
This commit is contained in:
Thad House
2021-06-17 23:03:00 -07:00
committed by GitHub
parent 49c71f9f2d
commit 9832fcfe14
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hal/src/main/native/athena/DIO.cpp
View File

@@ -281,12 +281,12 @@ void HAL_SetDIO(HAL_DigitalHandle dioPortHandle, HAL_Bool value,
if (port->channel >= kNumDigitalHeaders + kNumDigitalMXPChannels) {
isInput =
((currentOutputEnable.SPIPort >> remapSPIChannel(port->channel)) &
1) != 0;
1) == 0;
} else if (port->channel < kNumDigitalHeaders) {
isInput = ((currentOutputEnable.Headers >> port->channel) & 1) != 0;
isInput = ((currentOutputEnable.Headers >> port->channel) & 1) == 0;
} else {
isInput = ((currentOutputEnable.MXP >> remapMXPChannel(port->channel)) &
1) != 0;
1) == 0;
}
if (isInput) {
@@ -398,11 +398,11 @@ HAL_Bool HAL_GetDIODirection(HAL_DigitalHandle dioPortHandle, int32_t* status) {
if (port->channel >= kNumDigitalHeaders + kNumDigitalMXPChannels) {
return ((currentOutputEnable.SPIPort >> remapSPIChannel(port->channel)) &
1) != 0;
1) == 0;
} else if (port->channel < kNumDigitalHeaders) {
return ((currentOutputEnable.Headers >> port->channel) & 1) != 0;
return ((currentOutputEnable.Headers >> port->channel) & 1) == 0;
} else {
return ((currentOutputEnable.MXP >> remapMXPChannel(port->channel)) & 1) !=
return ((currentOutputEnable.MXP >> remapMXPChannel(port->channel)) & 1) ==
0;
}
}