dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-22 23:56:13 +01:00
Code Releases Activity

Fix mess after rebase and conflicts

Browse Source
This commit is contained in:
peteGSX 2023-02-01 07:49:31 +10:00
parent d375723a13
commit 6031a0fb7f
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IO_EXIOExpander.h
View File

@ -71,14 +71,12 @@ private:
_command2Buffer[0] = EXIOINIT;
_command2Buffer[1] = _nPins;
// Send config, if EXIOINITA returned, we're good, setup analogue input buffer, otherwise go offline
I2CManager.read(_i2cAddress, _receive3Buffer, 3, _command2Buffer, 2);
if (_receive3Buffer[0] == EXIOINITA) {
_numAnaloguePins = _receive3Buffer[1];
_numPWMPins = _receive3Buffer[2];
I2CManager.read(_i2cAddress, _receive2Buffer, 2, _command2Buffer, 2);
if (_receive2Buffer[0] == EXIOINITA) {
_numAnaloguePins = _receive2Buffer[1];
_analoguePinBytes = _numAnaloguePins * 2;
_analogueInputStates = (byte*) calloc(_analoguePinBytes, 1);
_analoguePinMap = (uint8_t*) calloc(_numAnaloguePins, 1);
} else {
DIAG(F("ERROR configuring EX-IOExpander device, I2C:x%x"), _i2cAddress);
_deviceState = DEVSTATE_FAILED;
@ -115,12 +113,6 @@ private:
_digitalOutBuffer[2] = pullup;
I2CManager.write(_i2cAddress, _digitalOutBuffer, 3);
return true;
} else if (configType == CONFIGURE_SERVO) {
DIAG(F("Configure servo at pin %d"), (int)pin);
for (int i = 0; i < paramCount; i++) {
DIAG(F("Param %d is %x"), (int)i, params[i]);
}
return true;
} else {
return false;
}
@ -182,6 +174,7 @@ private:
uint8_t _i2cAddress;
uint8_t _numAnaloguePins = 0;
uint8_t numDigitalPins = 0;
byte _digitalOutBuffer[3];
uint8_t _versionBuffer[3];
uint8_t _majorVer = 0;
@ -193,9 +186,8 @@ private:
uint8_t _analoguePinBytes = 0;
byte _command1Buffer[1];
byte _command2Buffer[2];
byte _receive3Buffer[3];
byte _receive2Buffer[2];
uint8_t* _analoguePinMap;
uint8_t _numPWMPins = 0;
enum {
EXIOINIT = 0xE0, // Flag to initialise setup procedure