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

* Fix issue if I2C initialized before DigitalSystem.

Browse Source 
Change-Id: I97bbbebb60730ddaad337a4a5dd73c9f40556a86
This commit is contained in:
Kevin O'Connor
2014-06-27 10:33:40 -04:00
parent 1ba20bc1eb
commit b2000a20d0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hal/lib/Athena/Digital.cpp
View File

@@ -1554,6 +1554,8 @@ void clearSPIReceivedData(void* spi_pointer, int32_t *status) {}
* @param port The port to open, 0 for the on-board, 1 for the MXP.
*/
void i2CInitialize(uint8_t port, int32_t *status) {
initializeDigital(status);
if(port > 1)
{
//Set port out of range error here
@@ -1570,7 +1572,6 @@ void i2CInitialize(uint8_t port, int32_t *status) {
} else if(port == 1) {
i2CMXPObjCount++;
if (i2CMXPHandle > 0) return;
initializeDigital(status);
digitalSystem->writeEnableMXPSpecialFunction(digitalSystem->readEnableMXPSpecialFunction(status)|0xC000, status);
i2CMXPHandle = i2clib_open("/dev/i2c-1");
}