dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 05:11:24 +01:00
Code Releases Activity

Version bugfix

Browse Source
This commit is contained in:
peteGSX 2022-12-26 07:36:12 +10:00
parent 70845b4932
commit 71ce913712
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IO_EXIOExpander.h
View File

@ -92,12 +92,12 @@ private:
return; return;
} }
// Attempt to get version, if we don't get it, we don't care, don't go offline // Attempt to get version, if we don't get it, we don't care, don't go offline
// Using digital buffers in reverse to save RAM // Using digital in buffer in reverse to save RAM
_digitalInBuffer[0] = EXIOVER; _digitalInBuffer[0] = EXIOVER;
I2CManager.read(_i2cAddress, _digitalOutBuffer, 3, _digitalInBuffer, 1, &_i2crb); I2CManager.read(_i2cAddress, _versionBuffer, 3, _digitalInBuffer, 1, &_i2crb);
_majorVer = _digitalOutBuffer[0]; _majorVer = _versionBuffer[0];
_minorVer = _digitalOutBuffer[1]; _minorVer = _versionBuffer[1];
_patchVer = _digitalOutBuffer[2]; _patchVer = _versionBuffer[2];
#ifdef DIAG_IO #ifdef DIAG_IO
_display(); _display();
#endif #endif
@ -146,9 +146,18 @@ private:
} }
void _display() override { void _display() override {
DIAG(F("EX-IOExpander I2C:x%x v%d.%d.%d: Digital Vpins %d-%d, Analogue Vpins %d-%d %S"), int _firstAnalogue, _lastAnalogue;
_i2cAddress, _majorVer, _minorVer, _patchVer, _firstVpin, _firstVpin + _numDigitalPins - 1, if (_numAnaloguePins == 0) {
_firstVpin + _numDigitalPins, _firstVpin + _nPins - 1, _firstAnalogue = 0;
_lastAnalogue = 0;
} else {
_firstAnalogue = _firstVpin + _numDigitalPins;
_lastAnalogue = _firstVpin + _nPins - 1;
}
DIAG(F("EX-IOExpander I2C:x%x v%d.%d.%d: %d Digital Vpins %d-%d, %d Analogue Vpins %d-%d %S"),
_i2cAddress, _majorVer, _minorVer, _patchVer,
_numDigitalPins, _firstVpin, _firstVpin + _numDigitalPins - 1,
_numAnaloguePins, _firstAnalogue, _lastAnalogue,
_deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F("")); _deviceState == DEVSTATE_FAILED ? F("OFFLINE") : F(""));
} }
@ -161,6 +170,7 @@ private:
byte _analogueOutBuffer[2]; byte _analogueOutBuffer[2];
byte _digitalOutBuffer[3]; byte _digitalOutBuffer[3];
byte _digitalInBuffer[1]; byte _digitalInBuffer[1];
uint8_t _versionBuffer[3];
uint8_t _majorVer = 0; uint8_t _majorVer = 0;
uint8_t _minorVer = 0; uint8_t _minorVer = 0;
uint8_t _patchVer = 0; uint8_t _patchVer = 0;