Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

artf3622: Each Solenoid creates handles for all other Solenoids as well

Browse Source 
Fixed so that one static handle is called for all Solenoids.

Change-Id: Ib5f3bbaa160d253e0533259bfe0e9e2a6f11733f
This commit is contained in:
jmanning
2015-06-17 14:42:09 -04:00
committed by Kevin O'Connor
parent 39130721d0
commit ead60eaab8
4 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibc/wpilibC++Devices/src/Solenoid.cpp
View File

@@ -88,7 +88,7 @@ void Solenoid::Set(bool on)
uint8_t value = on ? 0xFF : 0x00;
uint8_t mask = 1 << m_channel;
SolenoidBase::Set(value, mask);
SolenoidBase::Set(value, mask, m_moduleNumber);
}
/**
@@ -99,7 +99,7 @@ void Solenoid::Set(bool on)
bool Solenoid::Get()
{
if (StatusIsFatal()) return false;
uint8_t value = GetAll() & ( 1 << m_channel);
uint8_t value = GetAll(m_moduleNumber) & ( 1 << m_channel);
return (value != 0);
}
/**
@@ -112,7 +112,7 @@ bool Solenoid::Get()
*/
bool Solenoid::IsBlackListed()
{
int value = GetPCMSolenoidBlackList() & ( 1 << m_channel);
int value = GetPCMSolenoidBlackList(m_moduleNumber) & ( 1 << m_channel);
return (value != 0);
}