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

Revert "Uses ComputeDigitalMask function across HAL DIO (#837)" (#1005)

Browse Source 
This reverts commit c84bd744c8.
This commit is contained in:
Peter Johnson
2018-04-29 21:48:53 -07:00
committed by GitHub
parent c84bd744c8
commit a8fd88840d
3 changed files with 116 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hal/src/main/native/athena/DigitalInternal.cpp
View File

@@ -47,20 +47,24 @@ void InitializeDigitalInternal() {
namespace detail {
wpi::mutex& UnsafeGetDIOMutex() { return digitalDIOMutex; }
tDIO* UnsafeGetDigialSystem() { return digitalSystem.get(); }
} // namespace detail
int32_t ComputeDigitalMask(uint8_t channel) {
int32_t ComputeDigitalMask(HAL_DigitalHandle handle, int32_t* status) {
auto port = digitalChannelHandles->Get(handle, HAL_HandleEnum::DIO);
if (port == nullptr) {
*status = HAL_HANDLE_ERROR;
return 0;
}
tDIO::tDO output;
output.value = 0;
if (channel >= kNumDigitalHeaders + kNumDigitalMXPChannels) {
output.SPIPort = (1u << remapSPIChannel(channel));
} else if (channel < kNumDigitalHeaders) {
output.Headers = (1u << channel);
if (port->channel >= kNumDigitalHeaders + kNumDigitalMXPChannels) {
output.SPIPort = (1u << remapSPIChannel(port->channel));
} else if (port->channel < kNumDigitalHeaders) {
output.Headers = (1u << port->channel);
} else {
output.MXP = (1u << remapMXPChannel(channel));
output.MXP = (1u << remapMXPChannel(port->channel));
}
return output.value;
}
} // namespace detail
/**
* Initialize the digital system.