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

Merge pull request #297 from DCC-EX:31-exio-to-do-optimise-read-speed

Browse Source 
31-exio-to-do-optimise-read-speed
This commit is contained in:
peteGSX 2023-01-24 08:25:13 +10:00 committed by GitHub
commit 4f233de726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
IO_EXIOExpander.h
View File

@ -66,6 +66,10 @@ private:
_i2cAddress = i2cAddress; _i2cAddress = i2cAddress;
_numDigitalPins = numDigitalPins; _numDigitalPins = numDigitalPins;
_numAnaloguePins = numAnaloguePins; _numAnaloguePins = numAnaloguePins;
_digitalPinBytes = (numDigitalPins+7)/8;
_analoguePinBytes = numAnaloguePins * 2;
_digitalInputStates=(byte*) calloc(_digitalPinBytes,1);
_analogueInputStates=(byte*) calloc(_analoguePinBytes,1);
addDevice(this); addDevice(this);
} }
@ -77,16 +81,16 @@ private:
_digitalOutBuffer[1] = _numDigitalPins; _digitalOutBuffer[1] = _numDigitalPins;
_digitalOutBuffer[2] = _numAnaloguePins; _digitalOutBuffer[2] = _numAnaloguePins;
// Send config, if EXIORDY returned, we're good, otherwise go offline // Send config, if EXIORDY returned, we're good, otherwise go offline
I2CManager.read(_i2cAddress, _digitalInBuffer, 1, _digitalOutBuffer, 3); I2CManager.read(_i2cAddress, _commandBuffer, 1, _digitalOutBuffer, 3);
if (_digitalInBuffer[0] != EXIORDY) { if (_commandBuffer[0] != EXIORDY) {
DIAG(F("ERROR configuring EX-IOExpander device, I2C:x%x"), _i2cAddress); DIAG(F("ERROR configuring EX-IOExpander device, I2C:x%x"), _i2cAddress);
_deviceState = DEVSTATE_FAILED; _deviceState = DEVSTATE_FAILED;
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 in buffer in reverse to save RAM // Using digital in buffer in reverse to save RAM
_digitalInBuffer[0] = EXIOVER; _commandBuffer[0] = EXIOVER;
I2CManager.read(_i2cAddress, _versionBuffer, 3, _digitalInBuffer, 1); I2CManager.read(_i2cAddress, _versionBuffer, 3, _commandBuffer, 1);
_majorVer = _versionBuffer[0]; _majorVer = _versionBuffer[0];
_minorVer = _versionBuffer[1]; _minorVer = _versionBuffer[1];
_patchVer = _versionBuffer[2]; _patchVer = _versionBuffer[2];
@ -121,27 +125,36 @@ private:
int _configureAnalogIn(VPIN vpin) override { int _configureAnalogIn(VPIN vpin) override {
if (vpin < _firstVpin + _numDigitalPins) { if (vpin < _firstVpin + _numDigitalPins) {
DIAG(F("EX-IOExpander ERROR: Vpin %d is a digital pin, cannot use as an analogue pin"), vpin); DIAG(F("EX-IOExpander ERROR: Vpin %d is a digital pin, cannot use as an analogue pin"), vpin);
return false;
} }
return false; int pin = vpin - _firstVpin;
_analogueOutBuffer[0] = EXIOENAN;
_analogueOutBuffer[1] = pin;
I2CManager.write(_i2cAddress, _analogueOutBuffer, 2);
return true;
}
void _loop(unsigned long currentMicros) override {
_commandBuffer[0] = EXIORDD;
I2CManager.read(_i2cAddress, _digitalInputStates, _digitalPinBytes, _commandBuffer, 1);
_commandBuffer[0] = EXIORDAN;
I2CManager.read(_i2cAddress, _analogueInputStates, _analoguePinBytes, _commandBuffer, 1);
} }
int _readAnalogue(VPIN vpin) override { int _readAnalogue(VPIN vpin) override {
if (vpin < _firstVpin + _numDigitalPins) return false; if (vpin < _firstVpin + _numDigitalPins) return false;
int pin = vpin - _firstVpin; int pin = vpin - _firstVpin - _numDigitalPins;
_analogueOutBuffer[0] = EXIORDAN; uint8_t _pinLSBByte = pin * 2;
_analogueOutBuffer[1] = pin; uint8_t _pinMSBByte = _pinLSBByte + 1;
I2CManager.read(_i2cAddress, _analogueInBuffer, 2, _analogueOutBuffer, 2); return (_analogueInputStates[_pinMSBByte] << 8) + _analogueInputStates[_pinLSBByte];
return (_analogueInBuffer[1] << 8) + _analogueInBuffer[0];
} }
int _read(VPIN vpin) override { int _read(VPIN vpin) override {
if (vpin >= _firstVpin + _numDigitalPins) return false; if (vpin >= _firstVpin + _numDigitalPins) return false;
int pin = vpin - _firstVpin; int pin = vpin - _firstVpin;
_digitalOutBuffer[0] = EXIORDD; uint8_t pinByte = pin / 8;
_digitalOutBuffer[1] = pin; bool value = _digitalInputStates[pinByte] >> (pin - pinByte * 8);
_digitalOutBuffer[2] = 0x00; // Don't need to use this for reading return value;
I2CManager.read(_i2cAddress, _digitalInBuffer, 1, _digitalOutBuffer, 3);
return _digitalInBuffer[0];
} }
void _write(VPIN vpin, int value) override { void _write(VPIN vpin, int value) override {
@ -172,16 +185,17 @@ private:
uint8_t _i2cAddress; uint8_t _i2cAddress;
uint8_t _numDigitalPins; uint8_t _numDigitalPins;
uint8_t _numAnaloguePins; uint8_t _numAnaloguePins;
int _digitalPinBytes;
int _analoguePinBytes;
byte _analogueInBuffer[2];
byte _analogueOutBuffer[2]; byte _analogueOutBuffer[2];
byte _digitalOutBuffer[3]; byte _digitalOutBuffer[3];
byte _digitalInBuffer[1];
uint8_t _versionBuffer[3]; 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;
byte* _digitalInputStates;
byte* _analogueInputStates;
uint8_t _digitalPinBytes = 0;
uint8_t _analoguePinBytes = 0;
byte _commandBuffer[1];
enum { enum {
EXIOINIT = 0xE0, // Flag to initialise setup procedure EXIOINIT = 0xE0, // Flag to initialise setup procedure
@ -191,6 +205,7 @@ private:
EXIORDAN = 0xE4, // Flag to read an analogue input EXIORDAN = 0xE4, // Flag to read an analogue input
EXIOWRD = 0xE5, // Flag for digital write EXIOWRD = 0xE5, // Flag for digital write
EXIORDD = 0xE6, // Flag to read digital input EXIORDD = 0xE6, // Flag to read digital input
EXIOENAN = 0xE7, // Flag eo enable an analogue pin
}; };
}; };